Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tretiakov] 21563: Fix BSOD when executing gdi32_winetest bitmap
by tretiakov＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: tretiakov Date: Wed Apr 12 17:22:57 2006 New Revision: 21563 URL: http://svn.reactos.ru/svn/reactos?rev=21563&view=rev Log: Fix BSOD when executing gdi32_winetest bitmap Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Wed Apr 12 17:22:57 2006 @@ -454,6 +454,13 @@ BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits); + + if(DestBitmap == NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return 0; + } + DestSurfObj = EngLockSurface((HSURF)DestBitmap); SourcePalette = PALETTE_LockPalette(hSourcePalette);

1 0

[greatlrd] 21562: from w3seek: make the tree compile with gcc4 again
by greatlrd＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: greatlrd Date: Wed Apr 12 16:18:30 2006 New Revision: 21562 URL: http://svn.reactos.ru/svn/reactos?rev=21562&view=rev Log: from w3seek: make the tree compile with gcc4 again Modified: trunk/reactos/lib/recyclebin/recyclebin.h trunk/reactos/lib/recyclebin/recyclebin_v5.c Modified: trunk/reactos/lib/recyclebin/recyclebin.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.h… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin.h Wed Apr 12 16:18:30 2006 @@ -12,8 +12,8 @@ { FILETIME LastModification; FILETIME DeletionTime; - LARGE_INTEGER FileSize; - LARGE_INTEGER PhysicalFileSize; + ULARGE_INTEGER FileSize; + ULARGE_INTEGER PhysicalFileSize; DWORD Attributes; CHAR FileName[ANY_SIZE]; } DELETED_FILE_DETAILS_A, *PDELETED_FILE_DETAILS_A; @@ -21,8 +21,8 @@ { FILETIME LastModification; FILETIME DeletionTime; - LARGE_INTEGER FileSize; - LARGE_INTEGER PhysicalFileSize; + ULARGE_INTEGER FileSize; + ULARGE_INTEGER PhysicalFileSize; DWORD Attributes; WCHAR FileName[ANY_SIZE]; } DELETED_FILE_DETAILS_W, *PDELETED_FILE_DETAILS_W; Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_v… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c Wed Apr 12 16:18:30 2006 @@ -38,7 +38,7 @@ INFO2_HEADER Header; DELETED_FILE_RECORD DeletedFile; DWORD bytesRead, bytesWritten; - LARGE_INTEGER fileSize; + ULARGE_INTEGER fileSize; SYSTEMTIME SystemTime; WCHAR RootDir[4]; WCHAR DeletedFileName[2 * MAX_PATH];

1 0

[greatlrd] 21561: commiting file desktop.x from bug 252 , the patch is from j_anderw it make our win32k lile more stable
by greatlrd＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: greatlrd Date: Wed Apr 12 14:15:46 2006 New Revision: 21561 URL: http://svn.reactos.ru/svn/reactos?rev=21561&view=rev Log: commiting file desktop.x from bug 252 , the patch is from j_anderw it make our win32k lile more stable Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Wed Apr 12 14:15:46 2006 @@ -790,7 +790,9 @@ CSR_API_MESSAGE Request; PVOID DesktopHeapSystemBase = NULL; SIZE_T DesktopInfoSize; + UNICODE_STRING SafeDesktopName; DECLARE_RETURN(HDESK); + DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); UserEnterExclusive(); @@ -808,15 +810,29 @@ SetLastNtError(Status); RETURN( NULL); } + if(lpszDesktopName != NULL) + { + Status = IntSafeCopyUnicodeString(&SafeDesktopName, lpszDesktopName); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( NULL); + } + } + else + { + RtlInitUnicodeString(&SafeDesktopName, NULL); + } if (! IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name, - lpszDesktopName)) + &SafeDesktopName)) { SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); ObDereferenceObject(WinStaObject); + RtlFreeUnicodeString(&SafeDesktopName); RETURN( NULL); } - + RtlFreeUnicodeString(&SafeDesktopName); ObDereferenceObject(WinStaObject); /* @@ -998,6 +1014,7 @@ HWINSTA WinSta; PWINSTATION_OBJECT WinStaObject; UNICODE_STRING DesktopName; + UNICODE_STRING SafeDesktopName; NTSTATUS Status; HDESK Desktop; DECLARE_RETURN(HDESK); @@ -1024,14 +1041,30 @@ RETURN( 0); } + if(lpszDesktopName != NULL) + { + Status = IntSafeCopyUnicodeString(&SafeDesktopName, lpszDesktopName); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( NULL); + } + } + else + { + RtlInitUnicodeString(&SafeDesktopName, NULL); + } + if (!IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name, lpszDesktopName)) { SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); ObDereferenceObject(WinStaObject); + RtlFreeUnicodeString(&SafeDesktopName); RETURN( 0); } + RtlFreeUnicodeString(&SafeDesktopName); ObDereferenceObject(WinStaObject); DPRINT("Trying to open desktop (%wZ)\n", &DesktopName);

1 0

[hpoussin] 21560: When listing devices by connection, list PCI devices only. It only works on ReactOS (as Windows doesn't use the same instance ID for the PCI bus), but it prevents a crash
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Wed Apr 12 02:20:28 2006 New Revision: 21560 URL: http://svn.reactos.ru/svn/reactos?rev=21560&view=rev Log: When listing devices by connection, list PCI devices only. It only works on ReactOS (as Windows doesn't use the same instance ID for the PCI bus), but it prevents a crash Modified: trunk/reactos/base/applications/devmgr/devmgr.c Modified: trunk/reactos/base/applications/devmgr/devmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/devmgr/de… ============================================================================== --- trunk/reactos/base/applications/devmgr/devmgr.c (original) +++ trunk/reactos/base/applications/devmgr/devmgr.c Wed Apr 12 02:20:28 2006 @@ -269,7 +269,7 @@ DEVINST root; (void)ListView_DeleteAllItems(hwndListView); - cr = CM_Locate_DevNode(&root, NULL, 0); + cr = CM_Locate_DevNode(&root, TEXT("Root\\*PNP0A03\\0000"), 0); if (cr != CR_SUCCESS) { @@ -690,7 +690,7 @@ hwndButtonListByConnection = CreateWindowEx ( 0, "button", /* Builtin button class */ - "List by Connection", + "List by Connection (PCI)", WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, 200, 0, 190, 30, hwndParent, /* Parent is this window. */

1 0

[hpoussin] 21559: [AUDIT] Unlock devmgr Michael Fritsch and I are the only authors of this code, and no unclean method has been used to create it
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Wed Apr 12 02:18:08 2006 New Revision: 21559 URL: http://svn.reactos.ru/svn/reactos?rev=21559&view=rev Log: [AUDIT] Unlock devmgr Michael Fritsch and I are the only authors of this code, and no unclean method has been used to create it Modified: trunk/reactos/base/applications/devmgr/devmgr.c (props changed) Propchange: trunk/reactos/base/applications/devmgr/devmgr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 21558: Delete useless utils: patchnv4: Tries to patch the nVidia NT4 driver, which doesn't work anymore (we now report Windows 2000) dumprecbin: Dumps the contents of the recycle bin. Has been replaced by a recycle bin library at revision 21553
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Wed Apr 12 02:10:41 2006 New Revision: 21558 URL: http://svn.reactos.ru/svn/reactos?rev=21558&view=rev Log: Delete useless utils: patchnv4: Tries to patch the nVidia NT4 driver, which doesn't work anymore (we now report Windows 2000) dumprecbin: Dumps the contents of the recycle bin. Has been replaced by a recycle bin library at revision 21553 Removed: trunk/reactos/base/applications/utils/dumprecbin/ trunk/reactos/base/applications/utils/patchnv4/

1 0

[gedmurphy] 21557: add correct comments for buttons
by gedmurphy＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: gedmurphy Date: Wed Apr 12 02:04:32 2006 New Revision: 21557 URL: http://svn.reactos.ru/svn/reactos?rev=21557&view=rev Log: add correct comments for buttons Modified: trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/imagesoft/floatwindow.c Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/En.rc (original) +++ trunk/reactos/base/applications/imagesoft/En.rc Wed Apr 12 02:04:32 2006 @@ -87,7 +87,7 @@ BEGIN LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Wed Apr 12 02:04:32 2006 @@ -6,26 +6,26 @@ TBBUTTON ToolsButtons[] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {TBICON_RECTSEL, ID_RECTSEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_MOVESEL, ID_MOVESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_LASOO, ID_LASOO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* cut */ - {TBICON_MOVE, ID_MOVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* undo */ - {TBICON_ECLIPSESEL, ID_ECLIPSESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ - {TBICON_ZOOM, ID_ZOOM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_MAGICWAND, ID_MAGICWAND, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* paste */ - {TBICON_TEXT, ID_TEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_PAINTBRUSH, ID_PAINTBRUSH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_ERASER, ID_ERASER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* print */ - {TBICON_PENCIL, ID_PENCIL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_COLORPICKER, ID_COLORPICKER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ - {TBICON_CLONESTAMP, ID_CLONESTAMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ - {TBICON_RECOLORING, ID_RECOLORING, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_PAINTBUCKET, ID_PAINTBUCKET, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_LINE, ID_LINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* copy */ - {TBICON_RECTANGLE, ID_RECTANGLE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_ROUNDRECT, ID_ROUNDRECT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ - {TBICON_ECLIPSE, ID_ECLIPSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ - {TBICON_FREEFORM, ID_FREEFORM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* print preview */ + {TBICON_RECTSEL, ID_RECTSEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* rectangle select */ + {TBICON_MOVESEL, ID_MOVESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* move selected pixels */ + {TBICON_LASOO, ID_LASOO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* lasso select */ + {TBICON_MOVE, ID_MOVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* move selection */ + {TBICON_ECLIPSESEL, ID_ECLIPSESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* elipse select */ + {TBICON_ZOOM, ID_ZOOM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* zoom */ + {TBICON_MAGICWAND, ID_MAGICWAND, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* magic wand */ + {TBICON_TEXT, ID_TEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* text */ + {TBICON_PAINTBRUSH, ID_PAINTBRUSH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* paintbrush */ + {TBICON_ERASER, ID_ERASER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* eraser */ + {TBICON_PENCIL, ID_PENCIL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* pencil */ + {TBICON_COLORPICKER, ID_COLORPICKER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* color picker */ + {TBICON_CLONESTAMP, ID_CLONESTAMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* clone stamp */ + {TBICON_RECOLORING, ID_RECOLORING, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* recolor */ + {TBICON_PAINTBUCKET, ID_PAINTBUCKET, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* paint bucket */ + {TBICON_LINE, ID_LINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* line */ + {TBICON_RECTANGLE, ID_RECTANGLE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* rectangle */ + {TBICON_ROUNDRECT, ID_ROUNDRECT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* round rectangle */ + {TBICON_ECLIPSE, ID_ECLIPSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* elipse */ + {TBICON_FREEFORM, ID_FREEFORM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* free form */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, }; @@ -94,8 +94,6 @@ TB_AUTOSIZE, 0, 0); - - return; }

1 0

[hpoussin] 21556: First step to automatically generate registry entries for network protocols (TcpIp...) Registry settings are moved to media/inf/nettcpip.inf, which is installed for each netcard detected.
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Wed Apr 12 02:01:08 2006 New Revision: 21556 URL: http://svn.reactos.ru/svn/reactos?rev=21556&view=rev Log: First step to automatically generate registry entries for network protocols (TcpIp...) Registry settings are moved to media/inf/nettcpip.inf, which is installed for each netcard detected. Added: trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/media/inf/inf.rbuild Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Wed Apr 12 02:01:08 2006 @@ -78,16 +78,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E974-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetService" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Protocol" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetTrans" -; The following entries should be generated from .inf files during installation -; TCPIP Protocol -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080 -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","ComponentId",0x00000000,"ms_tcpip" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol (TCP/IP)" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfPath",0x00000000,"BUGBUG_Create from Inffile.inf" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfSection",0x00000000,"BUGBUG_Create from Inffile.inf" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip" @@ -708,32 +698,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Type",0x00010001,0x00000001 -; TCP/IP driver -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Group",0x00000000,"PNP_TDI" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ImagePath",0x00020000,"system32\drivers\tcpip.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Type",0x00010001,0x00000001 -; NOTE: These settings should be added by the network setup -; These bindings are of the windows 2000 type, and will probably need to be -; twiddled to get 3rd-party network-related software to work. -; NT4 puts additional stuff in the Bind, Export, and Route values. -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",0x00010000,"DataBasePath" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x00010000,"" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x00010000,"ROSHost" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","ForwardBroadcasts",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRouter",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0x00010000,"" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","EnableSecurityFilters",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\PersistentRoutes",,0x00000010 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcceptance",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00 -HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip" - ; Simple TCP services HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Description",0x00000000,"Supports the following TCP/IP services: Chargen, Daytime, Discard, Echo, QOTD" HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","DisplayName",0x00000000,"Simple TCP/IP Services" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Apr 12 02:01:08 2006 @@ -351,6 +351,7 @@ media\inf\netamd.inf 6 media\inf\netisa.inf 6 media\inf\netrtpnt.inf 6 +media\inf\nettcpip.inf 6 media\inf\ports.inf 6 media\inf\scsi.inf 6 media\inf\syssetup.inf 6 Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.c… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c Wed Apr 12 02:01:08 2006 @@ -90,6 +90,83 @@ cleanup: HeapFree(GetProcessHeap(), 0, Buffer); return rc; +} + +/* Install a section of a .inf file + * Returns TRUE if success, FALSE if failure. Error code can + * be retrieved with GetLastError() + */ +static BOOL +InstallInfSection( + IN HWND hWnd, + IN LPCWSTR InfFile, + IN LPCWSTR InfSection) +{ + WCHAR Buffer[MAX_PATH]; + HINF hInf = INVALID_HANDLE_VALUE; + UINT BufferSize; + PVOID Context = NULL; + BOOL ret = FALSE; + + /* Get Windows directory */ + BufferSize = MAX_PATH - 5 - wcslen(InfFile); + if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) + { + /* Function failed */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + /* We have enough space to add some information in the buffer */ + if (Buffer[wcslen(Buffer) - 1] != '\\') + wcscat(Buffer, L"\\"); + wcscat(Buffer, L"Inf\\"); + wcscat(Buffer, InfFile); + + /* Install specified section */ + hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto cleanup; + + Context = SetupInitDefaultQueueCallback(hWnd); + if (Context == NULL) + goto cleanup; + + ret = SetupInstallFromInfSectionW( + hWnd, hInf, + InfSection, SPINST_ALL, + NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, Context, + NULL, NULL); + +cleanup: + if (Context) + SetupTermDefaultQueueCallback(Context); + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + return ret; +} + +/* Add default services for network cards */ +static DWORD +InstallAdditionalServices( + IN HWND hWnd) +{ + BOOL ret; + + /* Install TCP/IP protocol */ + ret = InstallInfSection( + hWnd, + L"nettcpip.inf", + L"MS_TCPIP.PrimaryInstall"); + if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND) + { + DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError()); + return GetLastError(); + } + + /* You can add here more clients (SMB...) and services (DHCP server...) */ + + return ERROR_SUCCESS; } DWORD WINAPI @@ -346,6 +423,15 @@ goto cleanup; } + /* Install additionnal services */ + /* FIXME: do it only if it is a network adapter! */ + rc = InstallAdditionalServices(NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("InstallAdditionalServices() failed with error 0x%lx\n", rc); + goto cleanup; + } + /* HACK: hpoussin, Dec 2005. TCP/IP driver is not able to manage devices * which are installed after its startup. So, we have to reboot to take * this new netcard into account. Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=21… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild (original) +++ trunk/reactos/media/inf/inf.rbuild Wed Apr 12 02:01:08 2006 @@ -11,6 +11,7 @@ <installfile base="inf">netamd.inf</installfile> <installfile base="inf">netisa.inf</installfile> <installfile base="inf">netrtpnt.inf</installfile> +<installfile base="inf">nettcpip.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> <installfile base="inf">syssetup.inf</installfile> Added: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/nettcpip.inf (added) +++ trunk/reactos/media/inf/nettcpip.inf Wed Apr 12 02:01:08 2006 @@ -1,0 +1,61 @@ +; NETTCPIP.INF + +; Installation file for TCP/IP protocol + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = NetTrans +ClassGUID = {4D36E975-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 04/12/2006,1.00 + +;----------------------------- TCP/IP DRIVER ---------------------------- + +[MS_TCPIP.PrimaryInstall.NT] +AddReg = TCPIP_AddReg.NT + +[TCPIP_AddReg.NT] +; The following entries should be generated from .inf files during installation +; TCPIP Protocol +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080 +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","ComponentId",0x00000000,"ms_tcpip" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol (TCP/IP)" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfPath",0x00000000,"BUGBUG_Create from Inffile.inf" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfSection",0x00000000,"BUGBUG_Create from Inffile.inf" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip" + +; TCP/IP driver +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Group",0x00000000,"PNP_TDI" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ImagePath",0x00020000,"system32\drivers\tcpip.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Type",0x00010001,0x00000001 +; NOTE: These settings should be added by the network setup +; These bindings are of the windows 2000 type, and will probably need to be +; twiddled to get 3rd-party network-related software to work. +; NT4 puts additional stuff in the Bind, Export, and Route values. +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",0x00010000,"DataBasePath" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x00010000,"" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x00010000,"ROSHost" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","ForwardBroadcasts",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRouter",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0x00010000,"" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","EnableSecurityFilters",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\PersistentRoutes",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcceptance",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip" + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +

1 0

[hpoussin] 21555: [AUDIT] Unlock netcfgx I'm the only author of the code, and no unclean method has been used to create it
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Wed Apr 12 01:56:00 2006 New Revision: 21555 URL: http://svn.reactos.ru/svn/reactos?rev=21555&view=rev Log: [AUDIT] Unlock netcfgx I'm the only author of the code, and no unclean method has been used to create it Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c (props changed) trunk/reactos/dll/win32/netcfgx/netcfgx.def (props changed) trunk/reactos/dll/win32/netcfgx/netcfgx.h (props changed) Propchange: trunk/reactos/dll/win32/netcfgx/netcfgx.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/netcfgx/netcfgx.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/netcfgx/netcfgx.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 21554: [AUDIT] Unlock packages list No reason to let it locked, it is only a list of files
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Wed Apr 12 01:47:29 2006 New Revision: 21554 URL: http://svn.reactos.ru/svn/reactos?rev=21554&view=rev Log: [AUDIT] Unlock packages list No reason to let it locked, it is only a list of files Modified: trunk/reactos/boot/bootdata/packages/reactos.dff (props changed) Propchange: trunk/reactos/boot/bootdata/packages/reactos.dff ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -*

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