Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 21636: Bug 1363 : patch accpect with small change, review by me and hpoussin
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 18:05:19 2006 New Revision: 21636 URL: http://svn.reactos.ru/svn/reactos?rev=21636&view=rev Log: Bug 1363 : patch accpect with small change, review by me and hpoussin Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/c… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c Mon Apr 17 18:05:19 2006 @@ -66,6 +66,7 @@ ULONG ParameterType = ParameterValue->ParameterType; ULONG DataSize; PVOID Data; + WCHAR Buff[25]; if(ParameterType != NdisParameterInteger && ParameterType != NdisParameterHexInteger && @@ -80,15 +81,28 @@ /* reset parameter type to standard reg types */ switch(ParameterType) - { - /* TODO: figure out what do do with these; are they different? */ + { case NdisParameterHexInteger: - case NdisParameterInteger: - ParameterType = REG_SZ; - Data = &ParameterValue->ParameterData.IntegerData; - DataSize = sizeof(ULONG); - break; - + case NdisParameterInteger: + { + UNICODE_STRING Str; + + Str.Buffer = (PWSTR) &Buff; + Str.MaximumLength = (USHORT)sizeof(Buff); + Str.Length = 0; + + ParameterType = REG_SZ; + if (!NT_SUCCESS(RtlIntegerToUnicodeString( + ParameterValue->ParameterData.IntegerData, + (ParameterType == NdisParameterInteger) ? 10 : 16, &Str))) + { + *Status = NDIS_STATUS_FAILURE; + return; + } + Data = Str.Buffer; + DataSize = Str.Length; + } + break; case NdisParameterString: case NdisParameterMultiString: ParameterType = REG_SZ;

1 0

[gedmurphy] 21635: Bit of fun. Add a built-in coded message for the first time the screensaver is run. If removed, it will not reappear.
by gedmurphy＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: gedmurphy Date: Mon Apr 17 17:35:40 2006 New Revision: 21635 URL: http://svn.reactos.ru/svn/reactos?rev=21635&view=rev Log: Bit of fun. Add a built-in coded message for the first time the screensaver is run. If removed, it will not reappear. Modified: trunk/reactos/base/applications/screensavers/matrix/config.c trunk/reactos/base/applications/screensavers/matrix/settings.c Modified: trunk/reactos/base/applications/screensavers/matrix/config.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/config.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/config.c Mon Apr 17 17:35:40 2006 @@ -68,7 +68,7 @@ prevheight = GetSystemMetrics(SM_CYSCREEN) / GLYPH_HEIGHT + 1; //Add any saved messages to the combo box - for(index = 0; index < g_nNumMessages; index++) + for(index = 0; index <= g_nNumMessages; index++) { if(lstrlen(g_szMessages[index]) > 0) SendDlgItemMessage(hwnd, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)g_szMessages[index]); Modified: trunk/reactos/base/applications/screensavers/matrix/settings.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/settings.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/settings.c Mon Apr 17 17:35:40 2006 @@ -93,6 +93,11 @@ } } } + else + { + /* built-in coded message for first run */ + lstrcpyn(g_szMessages[0], "ReactOS", MAXMSG_LENGTH); + } RegCloseKey(hkey); free(hugechar);

1 0

[hpoussin] 21634: Fix VMware display driver installation
by hpoussin＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: hpoussin Date: Mon Apr 17 16:18:47 2006 New Revision: 21634 URL: http://svn.reactos.ru/svn/reactos?rev=21634&view=rev Log: Fix VMware display driver installation Modified: trunk/reactos/base/setup/vmwinst/vmware.inf Modified: trunk/reactos/base/setup/vmwinst/vmware.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/vmwinst/vmware.i… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmware.inf (original) +++ trunk/reactos/base/setup/vmwinst/vmware.inf Mon Apr 17 16:18:47 2006 @@ -29,4 +29,4 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.BitsPerPel",0x00010001,16 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.XResolution",0x00010001,800 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.YResolution",0x00010001,600 -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00\1&644af68e&0F","Service",0x00000000,"vmx_svga" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00\1&f103bba4&0F","Service",0x00000000,"vmx_svga"

1 0

[hpoussin] 21633: [AUDIT] No suspicious code detected in vmwinst
by hpoussin＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: hpoussin Date: Mon Apr 17 16:16:54 2006 New Revision: 21633 URL: http://svn.reactos.ru/svn/reactos?rev=21633&view=rev Log: [AUDIT] No suspicious code detected in vmwinst Modified: trunk/reactos/base/setup/vmwinst/Cz.rc (props changed) trunk/reactos/base/setup/vmwinst/De.rc (props changed) trunk/reactos/base/setup/vmwinst/Dk.rc (props changed) trunk/reactos/base/setup/vmwinst/En.rc (props changed) trunk/reactos/base/setup/vmwinst/Es.rc (props changed) trunk/reactos/base/setup/vmwinst/Hu.rc (props changed) trunk/reactos/base/setup/vmwinst/Ja.rc (props changed) trunk/reactos/base/setup/vmwinst/Ru.rc (props changed) trunk/reactos/base/setup/vmwinst/manifest.xml (props changed) trunk/reactos/base/setup/vmwinst/resources/header.bmp (props changed) trunk/reactos/base/setup/vmwinst/resources/watermark.bmp (props changed) trunk/reactos/base/setup/vmwinst/vmware.inf (props changed) trunk/reactos/base/setup/vmwinst/vmwinst.c (props changed) trunk/reactos/base/setup/vmwinst/vmwinst.h (props changed) trunk/reactos/base/setup/vmwinst/vmwinst.rc (props changed) Propchange: trunk/reactos/base/setup/vmwinst/Cz.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/De.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/Dk.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/En.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/Es.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/Hu.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/Ja.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/Ru.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/manifest.xml ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/resources/header.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/resources/watermark.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/vmware.inf ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/vmwinst.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/vmwinst.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/vmwinst/vmwinst.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21632: Fix for ReactOS build system Fixing all warings in the code it will make gcc queit Remove pargma they should have been set in the project file not hard code it.
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 15:26:50 2006 New Revision: 21632 URL: http://svn.reactos.ru/svn/reactos?rev=21632&view=rev Log: Fix for ReactOS build system Fixing all warings in the code it will make gcc queit Remove pargma they should have been set in the project file not hard code it. Modified: trunk/reactos/base/applications/screensavers/matrix/config.c trunk/reactos/base/applications/screensavers/matrix/globals.h trunk/reactos/base/applications/screensavers/matrix/matrix.h trunk/reactos/base/applications/screensavers/matrix/message.h trunk/reactos/base/applications/screensavers/matrix/screensave.c trunk/reactos/base/applications/screensavers/matrix/settings.c Modified: trunk/reactos/base/applications/screensavers/matrix/config.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/config.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/config.c Mon Apr 17 15:26:50 2006 @@ -11,7 +11,7 @@ #include "matrix.h" // needed for slider-controls -#pragma comment(lib, "comctl32.lib") +//#pragma comment(lib, "comctl32.lib") // // Called once for every font - add to list @@ -308,3 +308,4 @@ return 0; } + Modified: trunk/reactos/base/applications/screensavers/matrix/globals.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/globals.h (original) +++ trunk/reactos/base/applications/screensavers/matrix/globals.h Mon Apr 17 15:26:50 2006 @@ -60,4 +60,4 @@ } #endif -#endif +#endif Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/matrix.h (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.h Mon Apr 17 15:26:50 2006 @@ -67,4 +67,4 @@ } #endif -#endif +#endif Modified: trunk/reactos/base/applications/screensavers/matrix/message.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/message.h (original) +++ trunk/reactos/base/applications/screensavers/matrix/message.h Mon Apr 17 15:26:50 2006 @@ -29,4 +29,4 @@ } #endif -#endif +#endif Modified: trunk/reactos/base/applications/screensavers/matrix/screensave.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/screensave.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/screensave.c Mon Apr 17 15:26:50 2006 @@ -16,8 +16,8 @@ #include "matrix.h" #include "resource.h" -#pragma comment(lib, "libctiny.lib") -#pragma comment(linker, "/OPT:NOWIN98") +//#pragma comment(lib, "libctiny.lib") +//#pragma comment(linker, "/OPT:NOWIN98") // // Added: Multimonitor support!! Modified: trunk/reactos/base/applications/screensavers/matrix/settings.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/settings.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/settings.c Mon Apr 17 15:26:50 2006 @@ -155,4 +155,4 @@ RegCloseKey(hkey); free(hugechar); -} +}

1 0

[peterw] 21631: - Fix indentation (spaces -> TABs).
by peterw＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: peterw Date: Mon Apr 17 15:13:48 2006 New Revision: 21631 URL: http://svn.reactos.ru/svn/reactos?rev=21631&view=rev Log: - Fix indentation (spaces -> TABs). Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Apr 17 15:13:48 2006 @@ -209,7 +209,7 @@ case Win32CUI: handler = new MingwWin32CUIModuleHandler ( module ); break; - case Win32SCR: + case Win32SCR: case Win32GUI: handler = new MingwWin32GUIModuleHandler ( module ); break; Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Apr 17 15:13:48 2006 @@ -54,7 +54,7 @@ string module_type = GetExtension(module.GetTargetName()); bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); - bool exe = (module_type == ".exe") || (module_type == ".scr"); + bool exe = (module_type == ".exe") || (module_type == ".scr"); bool sys = (module_type == ".sys"); string path_basedir = module.GetPathToBaseDir (); Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Mon Apr 17 15:13:48 2006 @@ -47,7 +47,7 @@ case NativeCUI: case Win32DLL: case Win32CUI: - case Win32SCR: + case Win32SCR: case Win32GUI: case KernelModeDriver: case BootSector: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Apr 17 15:13:48 2006 @@ -743,7 +743,7 @@ return Win32CUI; if ( attribute.value == "win32gui" ) return Win32GUI; - if ( attribute.value == "win32scr" ) + if ( attribute.value == "win32scr" ) return Win32SCR; if ( attribute.value == "bootloader" ) return BootLoader; @@ -784,7 +784,7 @@ case Win32CUI: case Win32GUI: return ".exe"; - case Win32SCR: + case Win32SCR: return ".scr"; case KernelModeDLL: @@ -835,7 +835,7 @@ return "_wmainCRTStartup"; else return "_mainCRTStartup"; - case Win32SCR: + case Win32SCR: case Win32GUI: if ( isUnicode ) return "_wWinMainCRTStartup"; @@ -874,7 +874,7 @@ case Win32CUI: case Test: return "0x00400000"; - case Win32SCR: + case Win32SCR: case Win32GUI: return "0x00400000"; case KernelModeDLL: @@ -917,7 +917,7 @@ case NativeCUI: case Win32CUI: case Test: - case Win32SCR: + case Win32SCR: case Win32GUI: case BuildTool: case StaticLibrary: @@ -949,7 +949,7 @@ case NativeCUI: case Win32CUI: case Test: - case Win32SCR: + case Win32SCR: case Win32GUI: case BuildTool: case BootLoader: @@ -1401,7 +1401,7 @@ case NativeCUI: case Win32CUI: case Win32GUI: - case Win32SCR: + case Win32SCR: case KernelModeDriver: case BootSector: case BootLoader: Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Apr 17 15:13:48 2006 @@ -264,7 +264,7 @@ RpcClient = 17, Alias = 18, BootProgram = 19, - Win32SCR = 20 + Win32SCR = 20 }; enum HostType

1 0

[gedmurphy] 21630: fix spelling.
by gedmurphy＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: gedmurphy Date: Mon Apr 17 15:01:45 2006 New Revision: 21630 URL: http://svn.reactos.ru/svn/reactos?rev=21630&view=rev Log: fix spelling. Modified: vendor/matrix/Permission.txt Modified: vendor/matrix/Permission.txt URL: http://svn.reactos.ru/svn/reactos/vendor/matrix/Permission.txt?rev=21630&r1… ============================================================================== --- vendor/matrix/Permission.txt (original) +++ vendor/matrix/Permission.txt Mon Apr 17 15:01:45 2006 @@ -1,4 +1,4 @@ -Matrrix2 screensaver for ReactOS +Matrix2 screensaver for ReactOS /***************************************** @@ -14,4 +14,4 @@ credit where credit is due. --Magnus Olsen (aka GreatLord) / Aleasky (aka Fireball) +-Magnus Olsen (aka GreatLord) / Aleksey Bragin (aka Fireball)

1 0

[greatlrd] 21629: import matrix screensaver secon try
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 14:56:11 2006 New Revision: 21629 URL: http://svn.reactos.ru/svn/reactos?rev=21629&view=rev Log: import matrix screensaver secon try Added: trunk/reactos/base/applications/screensavers/matrix/ - copied from r21628, vendor/matrix/

1 0

[greatlrd] 21628: delete matrix I did someting wrong with the import
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 14:54:14 2006 New Revision: 21628 URL: http://svn.reactos.ru/svn/reactos?rev=21628&view=rev Log: delete matrix I did someting wrong with the import Removed: trunk/reactos/base/applications/screensavers/matrix/

1 0

[greatlrd] 21627: import matrix screen saver
by greatlrd＠svn.reactos.org 17 Apr '06

17 Apr '06

Author: greatlrd Date: Mon Apr 17 14:50:25 2006 New Revision: 21627 URL: http://svn.reactos.ru/svn/reactos?rev=21627&view=rev Log: import matrix screen saver Added: trunk/reactos/base/applications/screensavers/matrix/matrix/ - copied from r21626, vendor/matrix/

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