Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[mkupfer] 42836: Fix redraw bug by correcting nonclient region calculation. (Window->UpdateRegion has no proper values) TODO: calculate and/or update Window->UpdateRegion properly See issue #4181 for details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Aug 22 00:23:22 2009 New Revision: 42836 URL: http://svn.reactos.org/svn/reactos?rev=42836&view=rev Log: Fix redraw bug by correcting nonclient region calculation. (Window->UpdateRegion has no proper values) TODO: calculate and/or update Window->UpdateRegion properly See issue #4181 for details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sat Aug 22 00:23:22 2009 @@ -168,7 +168,7 @@ if (Window->UpdateRegion != NULL && Window->UpdateRegion != (HRGN)1) { - hRgnNonClient = NtGdiCreateRectRgn(0, 0, 0, 0); + hRgnNonClient = IntCalcWindowRgn(Window, FALSE); /* * If region creation fails it's safe to fallback to whole @@ -186,7 +186,7 @@ return (HRGN)1; } - RgnType = NtGdiCombineRgn(hRgnNonClient, Window->UpdateRegion, + RgnType = NtGdiCombineRgn(hRgnNonClient, hRgnNonClient, hRgnWindow, RGN_DIFF); if (RgnType == ERROR) {

15 years, 4 months

[janderwald] 42835: - Implement Window position/size saving & restoring - Implemented by Stefan Ludowicy (IRC: BasisBit) reactos A.T. basisbit .D.O.T. de

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 21 22:40:00 2009 New Revision: 42835 URL: http://svn.reactos.org/svn/reactos?rev=42835&view=rev Log: - Implement Window position/size saving & restoring - Implemented by Stefan Ludowicy (IRC: BasisBit) reactos A.T. basisbit .D.O.T. de Added: trunk/tools/reactosdbg/RosDBG/app.config (with props) Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Program.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -189,6 +189,7 @@ { RosDiagnostics.DebugTrace(RosDiagnostics.TraceType.Info, "Closing application"); mConnection.Close(true); + SaveWindowSettings(); } void UpdateDebuggerMenu() @@ -469,6 +470,14 @@ } } + private void SaveWindowSettings() + { + RosDBG.Properties.Settings.Default.Size = this.Size; + RosDBG.Properties.Settings.Default.Location = this.Location; + RosDBG.Properties.Settings.Default.WindowState = this.WindowState; + RosDBG.Properties.Settings.Default.Save(); + + } } Modified: trunk/tools/reactosdbg/RosDBG/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Program.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Program.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Program.cs [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -3,6 +3,7 @@ using System.Linq; using System.Threading; using System.Windows.Forms; +using System.Drawing; namespace RosDBG { @@ -20,6 +21,11 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); MainWindow mw = new MainWindow(); + + mw.WindowState = RosDBG.Properties.Settings.Default.WindowState; + mw.StartPosition = FormStartPosition.Manual; + mw.Location = RosDBG.Properties.Settings.Default.Location; + mw.Size = RosDBG.Properties.Settings.Default.Size; Application.Run(mw); } else Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.69")] -[assembly: AssemblyFileVersion("1.0.2.69")] +[assembly: AssemblyVersion("1.0.2.72")] +[assembly: AssemblyFileVersion("1.0.2.72")] Modified: trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -1,7 +1,7 @@ ï»¿//------------------------------------------------------------------------------ // <auto-generated> // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:2.0.50727.4016 +// Laufzeitversion:2.0.50727.3082 // // Ãnderungen an dieser Datei kÃ¶nnen falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -22,5 +22,41 @@ return defaultInstance; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point Location { + get { + return ((global::System.Drawing.Point)(this["Location"])); + } + set { + this["Location"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("792, 591")] + public global::System.Drawing.Size Size { + get { + return ((global::System.Drawing.Size)(this["Size"])); + } + set { + this["Size"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Normal")] + public global::System.Windows.Forms.FormWindowState WindowState { + get { + return ((global::System.Windows.Forms.FormWindowState)(this["WindowState"])); + } + set { + this["WindowState"] = value; + } + } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -1,7 +1,15 @@ ï»¿<?xml version='1.0' encoding='utf-8'?> -<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"> - <Profiles> - <Profile Name="(Default)" /> - </Profiles> - <Settings /> +<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="RosDBG.Properties" GeneratedClassName="Settings"> + <Profiles /> + <Settings> + <Setting Name="Location" Type="System.Drawing.Point" Scope="User"> + <Value Profile="(Default)">0, 0</Value> + </Setting> + <Setting Name="Size" Type="System.Drawing.Size" Scope="User"> + <Value Profile="(Default)">792, 591</Value> + </Setting> + <Setting Name="WindowState" Type="System.Windows.Forms.FormWindowState" Scope="User"> + <Value Profile="(Default)">Normal</Value> + </Setting> + </Settings> </SettingsFile> Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.30729</ProductVersion> + <ProductVersion>9.0.21022</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}</ProjectGuid> <OutputType>WinExe</OutputType> @@ -99,7 +99,6 @@ </Compile> <Compile Include="Diagnostics.cs" /> <Compile Include="Dockable Objects\BackTrace.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\BackTrace.Designer.cs"> <DependentUpon>BackTrace.cs</DependentUpon> @@ -117,7 +116,6 @@ <Compile Include="FileDirChooser.cs"> </Compile> <Compile Include="Dockable Objects\ToolWindow.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ToolWindow.Designer.cs"> <DependentUpon>ToolWindow.cs</DependentUpon> @@ -127,7 +125,6 @@ <Compile Include="IUseDebugConnection.cs" /> <Compile Include="IUseSymbols.cs" /> <Compile Include="Dockable Objects\Locals.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\Locals.Designer.cs"> <DependentUpon>Locals.cs</DependentUpon> @@ -139,7 +136,6 @@ <DependentUpon>MainWindow.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\MemoryWindow.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\MemoryWindow.Designer.cs"> <DependentUpon>MemoryWindow.cs</DependentUpon> @@ -147,13 +143,11 @@ <Compile Include="Module.cs" /> <Compile Include="ModuleIndex.cs" /> <Compile Include="Dockable Objects\Modules.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\Modules.Designer.cs"> <DependentUpon>Modules.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\ProcThread.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ProcThread.Designer.cs"> <DependentUpon>ProcThread.cs</DependentUpon> @@ -193,7 +187,7 @@ <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> - <Generator>ResXFileCodeGenerator</Generator> + <Generator>PublicResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> <SubType>Designer</SubType> </EmbeddedResource> @@ -232,19 +226,16 @@ <DesignTimeSharedInput>True</DesignTimeSharedInput> </Compile> <Compile Include="Dockable Objects\RawTraffic.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\RawTraffic.Designer.cs"> <DependentUpon>RawTraffic.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\ReactOSWeb.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ReactOSWeb.Designer.cs"> <DependentUpon>ReactOSWeb.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\RegisterView.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\RegisterView.Designer.cs"> <DependentUpon>RegisterView.cs</DependentUpon> @@ -256,7 +247,6 @@ <DependentUpon>Settings.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\SourceView.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\SourceView.Designer.cs"> <DependentUpon>SourceView.cs</DependentUpon> @@ -314,6 +304,7 @@ </ItemGroup> <ItemGroup> <Content Include="app-rosdbg.ico" /> + <None Include="app.config" /> <None Include="Resources\copyToolStripMenuItem.Image.png" /> <None Include="Resources\Run.bmp" /> <None Include="Resources\Pause.bmp" /> Added: trunk/tools/reactosdbg/RosDBG/app.config URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/app.config… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/app.config (added) +++ trunk/tools/reactosdbg/RosDBG/app.config [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -1,0 +1,22 @@ +ï»¿<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <configSections> + <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > + <section name="RosDBG.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> + </sectionGroup> + </configSections> + <connectionStrings /> + <userSettings> + <RosDBG.Properties.Settings> + <setting name="Location" serializeAs="String"> + <value>0, 0</value> + </setting> + <setting name="Size" serializeAs="String"> + <value>792, 591</value> + </setting> + <setting name="WindowState" serializeAs="String"> + <value>Normal</value> + </setting> + </RosDBG.Properties.Settings> + </userSettings> +</configuration> Propchange: trunk/tools/reactosdbg/RosDBG/app.config ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 4 months

[janderwald] 42834: - IOCTL_KS_WRITE_STREAM passes the data in the OutputBuffer, not InputBuffer

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 21 21:38:45 2009 New Revision: 42834 URL: http://svn.reactos.org/svn/reactos?rev=42834&view=rev Log: - IOCTL_KS_WRITE_STREAM passes the data in the OutputBuffer, not InputBuffer Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Aug 21 21:38:45 2009 @@ -657,7 +657,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - Length = IoStack->Parameters.DeviceIoControl.InputBufferLength; + Length = IoStack->Parameters.DeviceIoControl.OutputBufferLength; if (Irp->RequestorMode == KernelMode || Irp->AssociatedIrp.SystemBuffer) {

15 years, 4 months

[fireball] 42833: - Implement windows moving (with contents).

by fireball＠svn.reactos.org

Author: fireball Date: Fri Aug 21 21:13:00 2009 New Revision: 42833 URL: http://svn.reactos.org/svn/reactos?rev=42833&view=rev Log: - Implement windows moving (with contents). Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Fri Aug 21 21:13:00 2009 @@ -44,7 +44,7 @@ if (TRUE) { - OffsetRect( &dst_rect, -data->window_rect.left, -data->window_rect.top ); + //OffsetRect( &dst_rect, -data->window_rect.left, -data->window_rect.top ); parent = GetAncestor( data->hwnd, GA_PARENT ); hdc_src = GetDCEx( parent, 0, DCX_CACHE ); hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE | DCX_WINDOW ); @@ -58,18 +58,12 @@ hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } - //code = X11DRV_START_EXPOSURES; - //ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); - - ERR( "copying bits for win %p (parent %p)/ %s -> %s\n", - data->hwnd, parent, - wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); + //ERR( "copying bits for win %p (parent %p)/ %s -> %s\n", + // data->hwnd, parent, + // wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); BitBlt( hdc_dst, dst_rect.left, dst_rect.top, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, hdc_src, src_rect.left, src_rect.top, SRCCOPY ); - - //code = X11DRV_END_EXPOSURES; - //ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(rgn), (LPSTR)&rgn ); ReleaseDC( data->hwnd, hdc_dst ); if (hdc_src != hdc_dst) ReleaseDC( parent, hdc_src ); @@ -789,20 +783,6 @@ TRACE( "win %p cmd %d at %s flags %08x\n", hwnd, cmd, wine_dbgstr_rect(rect), swp ); -#if 0 - /* HACK */ - x = 1; - y = 1; - width = 50; - height = 50; - - rect->left = x; - rect->top = y; - rect->right = x + width; - rect->bottom = y + height; - //OffsetRect( rect, virtual_screen_rect.left, virtual_screen_rect.top ); - //X11DRV_X_to_window_rect( data, rect ); -#endif return swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); } @@ -876,7 +856,7 @@ } } - RosDrv_UpdateZOrder(hwnd, (RECT*)visible_rect); + //RosDrv_UpdateZOrder(hwnd, (RECT*)visible_rect); } /* EOF */

15 years, 4 months

[janderwald] 42832: - Fix a few bugs - Bug1 - BufferOverflow - Bug2 - ks expects a '\\' for each pin creation request - Bug3 - ObjectLength was not correctly set, thus truncating the request - Bug4 - Zero byte was not set at correct offset, potentialy leading to a heap overflow

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 21 20:36:43 2009 New Revision: 42832 URL: http://svn.reactos.org/svn/reactos?rev=42832&view=rev Log: - Fix a few bugs - Bug1 - BufferOverflow - Bug2 - ks expects a '\\' for each pin creation request - Bug3 - ObjectLength was not correctly set, thus truncating the request - Bug4 - Zero byte was not set at correct offset, potentialy leading to a heap overflow Modified: trunk/reactos/dll/directx/ksuser/ksuser.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Fri Aug 21 20:36:43 2009 @@ -44,18 +44,19 @@ Length = wcslen(IID); - TotalSize = (Length * sizeof(WCHAR)) + BufferSize + 2 * sizeof(WCHAR); + TotalSize = (Length * sizeof(WCHAR)) + BufferSize + 4 * sizeof(WCHAR); pStr = HeapAlloc(GetProcessHeap(), 0, TotalSize); if (!pStr) return STATUS_INSUFFICIENT_RESOURCES; - - wcscpy(pStr, (LPWSTR)IID); - pStr[Length] = L'\\'; - memcpy(&pStr[Length+1], Buffer, BufferSize); - pStr[Length+1+BufferSize] = L'\0'; + pStr[0] = L'\\'; + wcscpy(&pStr[1], (LPWSTR)IID); + pStr[Length+1] = L'\\'; + memcpy(&pStr[Length+2], Buffer, BufferSize); + pStr[Length+3+(BufferSize/sizeof(WCHAR))] = L'\0'; RtlInitUnicodeString(&ObjectName, pStr); + ObjectName.Length = ObjectName.MaximumLength = TotalSize; InitializeObjectAttributes(&ObjectAttributes, &ObjectName, OBJ_CASE_INSENSITIVE, hHandle, NULL);

15 years, 4 months

[sginsberg] 42831: - Fix EXT2 IFS for msvc: - Fix SEH for MSVC - Disable C4003 (caused by the try_return mess) - Add missing NTAPI to Ext2GetCurrentTime

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 21 19:39:37 2009 New Revision: 42831 URL: http://svn.reactos.org/svn/reactos?rev=42831&view=rev Log: - Fix EXT2 IFS for msvc: - Fix SEH for MSVC - Disable C4003 (caused by the try_return mess) - Add missing NTAPI to Ext2GetCurrentTime Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild trunk/reactos/drivers/filesystems/ext2/inc/struct.h trunk/reactos/drivers/filesystems/ext2/src/misc.c Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Fri Aug 21 19:39:37 2009 @@ -3,6 +3,7 @@ <module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="ext2fs">inc</include> + <compilerflag compilerset="msc">/wd4003</compilerflag> <library>ntoskrnl</library> <library>hal</library> <directory name="src"> Modified: trunk/reactos/drivers/filesystems/ext2/inc/struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] Fri Aug 21 19:39:37 2009 @@ -31,11 +31,21 @@ typedef PVOID PBCB; +// +// This is a huge hack that will create a broken driver for GCC. +// The driver should use PSEH2. +// +#ifdef _MSC_VER +#define try __try +#define except __except +#define finally __finally +#else #define try if (1) #define except(x) if (0 && (x)) #define finally if (1) #define GetExceptionInformation() 0 #define GetExceptionCode() 0 +#endif // we will use the LARGE_INTEGER structure as defined by NT Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Fri Aug 21 19:39:37 2009 @@ -2111,7 +2111,7 @@ } -ULONG Ext2GetCurrentTime() +ULONG NTAPI Ext2GetCurrentTime() { LARGE_INTEGER CurrentTime; ULONG Time;

15 years, 4 months

[mkupfer] 42830: fixed typo in German translation

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Aug 21 19:27:28 2009 New Revision: 42830 URL: http://svn.reactos.org/svn/reactos?rev=42830&view=rev Log: fixed typo in German translation Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Fri Aug 21 19:27:28 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Audio Grabber @@ -15,5 +15,5 @@ [Section.0407] Licence = Unbekannt Description = Ein sehr guter CD-Ripper/Audio-Datei-Konverter. -URLSize = Unbekannt +URLSite = Unbekannt Size = Unbekannt

15 years, 4 months

[sginsberg] 42829: - svchost: #ifdef _MSC_VER doesn't mean "using Microsoft's headers" anymore - ddraw, imm32, msxml3, oleaut32, riched20: Include typeof.h for typeof emulation when compiling under MSVC and remove from ReactOS-generic.rbuild (this can't go to port.h as the modules do not include it). - TCPIP: Fix a check for MSVC. - NDIS: Don't use floating point arithmetics in kernel mode -- spotted by MSVC trying to link to ftol (gcc inlined the operation). - SAMLIB: Use __VA_ARGS__ instead of

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 21 17:57:26 2009 New Revision: 42829 URL: http://svn.reactos.org/svn/reactos?rev=42829&view=rev Log: - svchost: #ifdef _MSC_VER doesn't mean "using Microsoft's headers" anymore - ddraw, imm32, msxml3, oleaut32, riched20: Include typeof.h for typeof emulation when compiling under MSVC and remove from ReactOS-generic.rbuild (this can't go to port.h as the modules do not include it). - TCPIP: Fix a check for MSVC. - NDIS: Don't use floating point arithmetics in kernel mode -- spotted by MSVC trying to link to ftol (gcc inlined the operation). - SAMLIB: Use __VA_ARGS__ instead of gcc-specific macro manipulation. - WIN32CSR: Don't use gcc-specific \% if you want % in the string -- this is incorrect and will pass a broken string to swprintf (the code seems to be uncalled though, so this shouldn't change anything). Use %% instead. - Error out on MSVC implementation of logb -- it doesn't produce the same code as the gcc version. - Rename gcc's float.h to gcc_float.h and use #include instead of #include_next for consistency. - Remove leftover header guard from types.h - Remove superfluous brackets from PSEH2->MSVC defines -- this isn't necessary anymore after 41597 - Correction to 42216: MSVC *does* let you define types in a function, but only at the top of scope. Move back the C_ASSERT into KiAcquireGuardedMutex. - Simplify definition of alloca - scripts.cpp: Silence unavoidable warning. - Remove compile time warning from Uniata -- the code has been unused for 1 1/2 years and will probably remain so. Added: trunk/reactos/include/crt/mingw32/gcc_float.h - copied unchanged from r42808, trunk/reactos/include/crt/mingw32/float.h Removed: trunk/reactos/include/crt/mingw32/float.h Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/services/svchost/svchost.h trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/win32/imm32/imm32.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/samlib/debug.h trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/include/crt/float.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/sys/types.h trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/nls/scripts/scripts.cpp trunk/reactos/lib/sdk/crt/float/i386/logb.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -100,7 +100,6 @@ <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> - <compilerflag>/FIwine/typeof.h</compilerflag> </group> <group compilerset="gcc"> Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ -#ifdef _MSC_VER +#if 0 #define _CRT_SECURE_NO_DEPRECATE 1 #endif Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <define name="USE_WIN32_OPENGL" /> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <library>advapi32</library> <library>dxguid</library> Modified: trunk/reactos/dll/win32/imm32/imm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.rbui… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm32.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <file>imm.c</file> <file>version.rc</file> <library>wine</library> Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -10,6 +10,7 @@ <define name="_WINE" /> <redefine name="_WIN32_WINNT">0x601</redefine> <define name="LIBXML_STATIC" /> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <library>libxml2</library> <library>libxslt</library> <library>wine</library> Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -15,6 +15,7 @@ <define name="PROXY_DELEGATION"/> <define name="REGISTER_PROXY_DLL"/> <define name="ENTRY_PREFIX">OLEAUTPS_</define> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <file>connpt.c</file> <file>dispatch.c</file> <file>hash.c</file> Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… ============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -6,6 +6,7 @@ <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag> <file>caret.c</file> <file>clipboard.c</file> Modified: trunk/reactos/dll/win32/samlib/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/debug.h?r… ============================================================================== --- trunk/reactos/dll/win32/samlib/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/debug.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -1,12 +1,12 @@ #ifdef NDEBUG -#define DPRINT(args...) +#define DPRINT(...) #define CHECKPOINT #else -#define DPRINT(args...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(args); } while(0) +#define DPRINT(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) #define CHECKPOINT do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) #endif -#define DPRINT1(args...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(args); } while(0) +#define DPRINT1(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) #define CHECKPOINT1 do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -705,7 +705,14 @@ while (j < str.Length && str.Buffer[j] != '\0') j++; - *NetworkAddressLength = (UINT)((j/2)+0.5); + if ((j % 2) == 0) + { + *NetworkAddressLength = (UINT)(j/2); + } + else + { + *NetworkAddressLength = (UINT)((j/2)+1); + } if ((*NetworkAddressLength) == 0) { Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -1058,7 +1058,7 @@ ("About to call send routine %x\n", (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send))); - if( (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send) ) + if( (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send != NULL) ) Status = (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send)( Request.Handle.AddressHandle, DgramInfo->SendDatagramInformation, Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -426,9 +426,8 @@ i++; } else { #ifdef _MSC_VER -#pragma message ("HACK HACK HACK Disabling warning HACK HACK HACK") #pragma warning(push) -#pragma warning(disable:4333) +#pragma warning(disable:4333) // right shift by too large amount, data loss #endif fis[7] |= (plba[3] >> 24) & 0x0f; #ifdef _MSC_VER Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=42… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -16,12 +16,12 @@ * */ -#ifdef __GNUC__ -#include_next<float.h> -#endif - -#ifdef _MSC_VER +#if defined(__GNUC__) +#include <gcc_float.h> +#elif defined(_MSC_VER) #include <msc_float.h> +#else +#error #endif #ifndef _MINGW_FLOAT_H_ Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -146,12 +146,7 @@ #endif /* RC_INVOKED */ #ifndef NO_OLDNAMES -#undef alloca -#ifdef __GNUC__ -#define alloca(x) __builtin_alloca((x)) -#else #define alloca _alloca -#endif #endif #ifdef HEAPHOOK Removed: trunk/reactos/include/crt/mingw32/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/float.… ============================================================================== --- trunk/reactos/include/crt/mingw32/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/float.h (removed) @@ -1,162 +1,0 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ - -/* As a special exception, if you include this header file into source - files compiled by GCC, this header file does not by itself cause - the resulting executable to be covered by the GNU General Public - License. This exception does not however invalidate any other - reasons why the executable file might be covered by the GNU General - Public License. */ - -/* - * ISO C Standard: 5.2.4.2.2 Characteristics of floating types <float.h> - */ - -#ifndef _FLOAT_H___ -#define _FLOAT_H___ - -/* Radix of exponent representation, b. */ -#undef FLT_RADIX -#define FLT_RADIX __FLT_RADIX__ - -/* Number of base-FLT_RADIX digits in the significand, p. */ -#undef FLT_MANT_DIG -#undef DBL_MANT_DIG -#undef LDBL_MANT_DIG -#define FLT_MANT_DIG __FLT_MANT_DIG__ -#define DBL_MANT_DIG __DBL_MANT_DIG__ -#define LDBL_MANT_DIG __LDBL_MANT_DIG__ - -/* Number of decimal digits, q, such that any floating-point number with q - decimal digits can be rounded into a floating-point number with p radix b - digits and back again without change to the q decimal digits, - - p * log10(b) if b is a power of 10 - floor((p - 1) * log10(b)) otherwise -*/ -#undef FLT_DIG -#undef DBL_DIG -#undef LDBL_DIG -#define FLT_DIG __FLT_DIG__ -#define DBL_DIG __DBL_DIG__ -#define LDBL_DIG __LDBL_DIG__ - -/* Minimum int x such that FLT_RADIX**(x-1) is a normalized float, emin */ -#undef FLT_MIN_EXP -#undef DBL_MIN_EXP -#undef LDBL_MIN_EXP -#define FLT_MIN_EXP __FLT_MIN_EXP__ -#define DBL_MIN_EXP __DBL_MIN_EXP__ -#define LDBL_MIN_EXP __LDBL_MIN_EXP__ - -/* Minimum negative integer such that 10 raised to that power is in the - range of normalized floating-point numbers, - - ceil(log10(b) * (emin - 1)) -*/ -#undef FLT_MIN_10_EXP -#undef DBL_MIN_10_EXP -#undef LDBL_MIN_10_EXP -#define FLT_MIN_10_EXP __FLT_MIN_10_EXP__ -#define DBL_MIN_10_EXP __DBL_MIN_10_EXP__ -#define LDBL_MIN_10_EXP __LDBL_MIN_10_EXP__ - -/* Maximum int x such that FLT_RADIX**(x-1) is a representable float, emax. */ -#undef FLT_MAX_EXP -#undef DBL_MAX_EXP -#undef LDBL_MAX_EXP -#define FLT_MAX_EXP __FLT_MAX_EXP__ -#define DBL_MAX_EXP __DBL_MAX_EXP__ -#define LDBL_MAX_EXP __LDBL_MAX_EXP__ - -/* Maximum integer such that 10 raised to that power is in the range of - representable finite floating-point numbers, - - floor(log10((1 - b**-p) * b**emax)) -*/ -#undef FLT_MAX_10_EXP -#undef DBL_MAX_10_EXP -#undef LDBL_MAX_10_EXP -#define FLT_MAX_10_EXP __FLT_MAX_10_EXP__ -#define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ -#define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ - -/* Maximum representable finite floating-point number, - - (1 - b**-p) * b**emax -*/ -#undef FLT_MAX -#undef DBL_MAX -#undef LDBL_MAX -#define FLT_MAX __FLT_MAX__ -#define DBL_MAX __DBL_MAX__ -#define LDBL_MAX __LDBL_MAX__ - -/* The difference between 1 and the least value greater than 1 that is - representable in the given floating point type, b**1-p. */ -#undef FLT_EPSILON -#undef DBL_EPSILON -#undef LDBL_EPSILON -#define FLT_EPSILON __FLT_EPSILON__ -#define DBL_EPSILON __DBL_EPSILON__ -#define LDBL_EPSILON __LDBL_EPSILON__ - -/* Minimum normalized positive floating-point number, b**(emin - 1). */ -#undef FLT_MIN -#undef DBL_MIN -#undef LDBL_MIN -#define FLT_MIN __FLT_MIN__ -#define DBL_MIN __DBL_MIN__ -#define LDBL_MIN __LDBL_MIN__ - -/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown. */ -/* ??? This is supposed to change with calls to fesetround in <fenv.h>. */ -#undef FLT_ROUNDS -#define FLT_ROUNDS 1 - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -/* The floating-point expression evaluation method. - -1 indeterminate - 0 evaluate all operations and constants just to the range and - precision of the type - 1 evaluate operations and constants of type float and double - to the range and precision of the double type, evaluate - long double operations and constants to the range and - precision of the long double type - 2 evaluate all operations and constants to the range and - precision of the long double type - - ??? This ought to change with the setting of the fp control word; - the value provided by the compiler assumes the widest setting. */ -#undef FLT_EVAL_METHOD -#define FLT_EVAL_METHOD __FLT_EVAL_METHOD__ - -/* Number of decimal digits, n, such that any floating-point number in the - widest supported floating type with pmax radix b digits can be rounded - to a floating-point number with n decimal digits and back again without - change to the value, - - pmax * log10(b) if b is a power of 10 - ceil(1 + pmax * log10(b)) otherwise -*/ -#undef DECIMAL_DIG -#define DECIMAL_DIG __DECIMAL_DIG__ - -#endif /* C99 */ -#endif /* _FLOAT_H___ */ Modified: trunk/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/types.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/types.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/types.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -36,9 +36,7 @@ # endif #endif -#ifdef _WINE -#ifndef _PID_T_ -#define _PID_T_ +#if defined(_WINE) #ifndef _WIN64 typedef int _pid_t; #else @@ -50,7 +48,6 @@ typedef _pid_t pid_t; #endif /* __pid_t_defined */ #endif -#endif /* Not _PID_T_ */ #endif #endif /* !_INC_TYPES */ Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -370,10 +370,10 @@ #include <excpt.h> -#define _SEH2_TRY __try { -#define _SEH2_FINALLY } __finally { -#define _SEH2_EXCEPT(...) } __except(__VA_ARGS__) { -#define _SEH2_END } +#define _SEH2_TRY __try +#define _SEH2_FINALLY __finally +#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) +#define _SEH2_END #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) #define _SEH2_GetExceptionCode() (GetExceptionCode()) Modified: trunk/reactos/lib/nls/scripts/scripts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/scripts/scripts.cp… ============================================================================== --- trunk/reactos/lib/nls/scripts/scripts.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/nls/scripts/scripts.cpp [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -45,6 +45,11 @@ #include "scripts.h" +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4351) // elements of array 'array' will be default initialized +#endif + struct SCRIPTS_ScriptsSet { private: @@ -144,6 +149,10 @@ return retval; } }; + +#ifdef _MSC_VER +#pragma warning(pop) +#endif int WINAPI Modified: trunk/reactos/lib/sdk/crt/float/i386/logb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/log… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/logb.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/logb.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -29,6 +29,7 @@ ("fxtract\n\t" : "=t" (__junk), "=u" (__val) : "0" (__x)); #else +#error REVIEW ME __asm fld [__x]; __asm fxtract; __asm fstp st(0); Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=428… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -117,15 +117,15 @@ NULL); } -/* KiAcquireGuardedMutex depends on these bits being right */ -C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); - VOID FASTCALL KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex) { ULONG BitsToRemove, BitsToAdd; LONG OldValue, NewValue; + + /* We depend on these bits being just right */ + C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); /* Increase the contention count */ GuardedMutex->Contention++; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -375,11 +375,11 @@ while((ptr = wcschr(szProcessName, L'\\'))) ptr[0] = L'_'; - swprintf(szBuffer, L"Console\\\%SystemRoot\%%S", &szProcessName[wLength]); + swprintf(szBuffer, L"Console\\%%SystemRoot%%%S", &szProcessName[wLength]); DPRINT("#3 Path : %S\n", szBuffer); if (RegOpenKeyExW(hKey, szBuffer, 0, samDesired, hSubKey) == ERROR_SUCCESS) { - swprintf(GuiData->szProcessName, L"\%SystemRoot\%%S", &szProcessName[wLength]); + swprintf(GuiData->szProcessName, L"%%SystemRoot%%%S", &szProcessName[wLength]); RegCloseKey(hKey); return TRUE; }

15 years, 4 months

[janderwald] 42828: - Kernel is not yet writing the Control key when activating a device interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 21 17:08:46 2009 New Revision: 42828 URL: http://svn.reactos.org/svn/reactos?rev=42828&view=rev Log: - Kernel is not yet writing the Control key when activating a device interface Modified: trunk/reactos/dll/win32/setupapi/interface.c Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Fri Aug 21 17:08:46 2009 @@ -255,6 +255,7 @@ rc = RegOpenKeyExW(hReferenceKey, Control, 0, KEY_QUERY_VALUE, &hControlKey); if (rc != ERROR_SUCCESS) { +#if 0 if (OnlyPresentInterfaces) { DestroyDeviceInterface(interfaceInfo); @@ -262,6 +263,7 @@ } else interfaceInfo->Flags |= SPINT_REMOVED; +#endif } else {

15 years, 4 months

[janderwald] 42827: - RegQueryValueExW returns ERRROR_SUCCESS

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 21 16:53:04 2009 New Revision: 42827 URL: http://svn.reactos.org/svn/reactos?rev=42827&view=rev Log: - RegQueryValueExW returns ERRROR_SUCCESS Modified: trunk/reactos/dll/win32/setupapi/interface.c Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Fri Aug 21 16:53:04 2009 @@ -266,7 +266,7 @@ else { dwLength = sizeof(DWORD); - if (RegQueryValueExW(hControlKey, Linked, NULL, &dwRegType, (LPBYTE)&LinkedValue, &dwLength) + if (RegQueryValueExW(hControlKey, Linked, NULL, &dwRegType, (LPBYTE)&LinkedValue, &dwLength) == ERROR_SUCCESS && dwRegType == REG_DWORD && LinkedValue) interfaceInfo->Flags |= SPINT_ACTIVE; RegCloseKey(hControlKey);

15 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009