Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 67031: [SYSSETUP] - Don't run vmwinst. It no longer works, and the real VMware Tools installer works fine CORE-9481 #resolve
by tfaber＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tfaber Date: Sat Apr 4 09:07:45 2015 New Revision: 67031 URL: http://svn.reactos.org/svn/reactos?rev=67031&view=rev Log: [SYSSETUP] - Don't run vmwinst. It no longer works, and the real VMware Tools installer works fine CORE-9481 #resolve Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Apr 4 09:07:45 2015 @@ -19,7 +19,7 @@ #define NDEBUG #include <debug.h> -#define VMWINST +#undef VMWINST #define PM_REGISTRATION_NOTIFY (WM_APP + 1) /* Private Message used to communicate progress from the background

1 0

[tfaber] 67030: [RTL] - Use annotations and consistent parameter naming in RtlIpv*
by tfaber＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tfaber Date: Sat Apr 4 08:00:59 2015 New Revision: 67030 URL: http://svn.reactos.org/svn/reactos?rev=67030&view=rev Log: [RTL] - Use annotations and consistent parameter naming in RtlIpv* Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6703… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sat Apr 4 08:00:59 2015 @@ -104,12 +104,13 @@ */ PSTR NTAPI -RtlIpv4AddressToStringA(IN const struct in_addr *Addr, - OUT PCHAR S) +RtlIpv4AddressToStringA( + _In_ const struct in_addr *Addr, + _Out_writes_(16) PCHAR S) { INT Length; - if (!S) return (LPSTR)~0; + if (!S) return (PSTR)~0; Length = sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, @@ -124,10 +125,11 @@ */ NTSTATUS NTAPI -RtlIpv4AddressToStringExA(IN const struct in_addr *Address, - IN USHORT Port, - OUT PCHAR AddressString, - IN OUT PULONG AddressStringLength) +RtlIpv4AddressToStringExA( + _In_ const struct in_addr *Address, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PCHAR AddressString, + _Inout_ PULONG AddressStringLength) { CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; ULONG Length; @@ -158,12 +160,13 @@ */ PWSTR NTAPI -RtlIpv4AddressToStringW(IN const struct in_addr *Addr, - OUT PWCHAR S) +RtlIpv4AddressToStringW( + _In_ const struct in_addr *Addr, + _Out_writes_(16) PWCHAR S) { INT Length; - if (!S) return (LPWSTR)~0; + if (!S) return (PWSTR)~0; Length = swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, @@ -177,10 +180,11 @@ */ NTSTATUS NTAPI -RtlIpv4AddressToStringExW(IN const struct in_addr *Address, - IN USHORT Port, - OUT PWCHAR AddressString, - IN OUT PULONG AddressStringLength) +RtlIpv4AddressToStringExW( + _In_ const struct in_addr *Address, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString, + _Inout_ PULONG AddressStringLength) { WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; ULONG Length; @@ -390,8 +394,9 @@ */ PSTR NTAPI -RtlIpv6AddressToStringA(IN const struct in6_addr *Addr, - OUT PCHAR S) +RtlIpv6AddressToStringA( + _In_ const struct in6_addr *Addr, + _Out_writes_(46) PSTR S) { UNIMPLEMENTED; return NULL; @@ -402,11 +407,12 @@ */ NTSTATUS NTAPI -RtlIpv6AddressToStringExA(IN const struct in6_addr *Address, - IN ULONG ScopeId, - IN USHORT Port, - OUT PCHAR AddressString, - IN OUT PULONG AddressStringLength) +RtlIpv6AddressToStringExA( + _In_ const struct in6_addr *Address, + _In_ ULONG ScopeId, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PSTR AddressString, + _Inout_ PULONG AddressStringLength) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -417,8 +423,9 @@ */ PWSTR NTAPI -RtlIpv6AddressToStringW(IN const struct in6_addr *Addr, - OUT PWCHAR S) +RtlIpv6AddressToStringW( + _In_ const struct in6_addr *Addr, + _Out_writes_(46) PWSTR S) { UNIMPLEMENTED; return NULL; @@ -429,11 +436,12 @@ */ NTSTATUS NTAPI -RtlIpv6AddressToStringExW(IN const struct in6_addr *Address, - IN ULONG ScopeId, - IN USHORT Port, - IN OUT PWCHAR AddressString, - IN OUT PULONG AddressStringLength) +RtlIpv6AddressToStringExW( + _In_ const struct in6_addr *Address, + _In_ ULONG ScopeId, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString, + _Inout_ PULONG AddressStringLength) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -444,9 +452,10 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressA(IN PCSTR Name, - OUT PCSTR *Terminator, - OUT struct in6_addr *Addr) +RtlIpv6StringToAddressA( + _In_ PCSTR String, + _Out_ PCSTR *Terminator, + _Out_ struct in6_addr *Addr) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -457,10 +466,11 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExA(IN PCSTR AddressString, - OUT struct in6_addr *Address, - OUT PULONG ScopeId, - OUT PUSHORT Port) +RtlIpv6StringToAddressExA( + _In_ PCSTR AddressString, + _Out_ struct in6_addr *Address, + _Out_ PULONG ScopeId, + _Out_ PUSHORT Port) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -471,9 +481,10 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressW(IN PCWSTR Name, - OUT PCWSTR *Terminator, - OUT struct in6_addr *Addr) +RtlIpv6StringToAddressW( + _In_ PCWSTR String, + _Out_ PCWSTR *Terminator, + _Out_ struct in6_addr *Addr) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -484,10 +495,11 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExW(IN PCWSTR AddressName, - OUT struct in6_addr *Address, - OUT PULONG ScopeId, - OUT PUSHORT Port) +RtlIpv6StringToAddressExW( + _In_ PCWSTR AddressString, + _Out_ struct in6_addr *Address, + _Out_ PULONG ScopeId, + _Out_ PUSHORT Port) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

1 0

[tfaber] 67029: [NDK][RTL] - Fix RtlIpv* function prototypes, and add missing ones. Patch by Mark Jansen CORE-6490
by tfaber＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tfaber Date: Sat Apr 4 07:38:39 2015 New Revision: 67029 URL: http://svn.reactos.org/svn/reactos?rev=67029&view=rev Log: [NDK][RTL] - Fix RtlIpv* function prototypes, and add missing ones. Patch by Mark Jansen CORE-6490 Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Apr 4 07:38:39 2015 @@ -3994,6 +3994,41 @@ // Network Functions // NTSYSAPI +PSTR +NTAPI +RtlIpv4AddressToStringA( + _In_ const struct in_addr *Addr, + _Out_writes_(16) PCHAR S +); + +NTSYSAPI +PWSTR +NTAPI +RtlIpv4AddressToStringW( + _In_ const struct in_addr *Addr, + _Out_writes_(16) PWCHAR S +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv4AddressToStringExA( + _In_ const struct in_addr *Address, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PCHAR AddressString, + _Inout_ PULONG AddressStringLength +); + +NTSTATUS +NTAPI +RtlIpv4AddressToStringExW( + _In_ const struct in_addr *Address, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString, + _Inout_ PULONG AddressStringLength +); + +NTSYSAPI NTSTATUS NTAPI RtlIpv4StringToAddressA( @@ -4034,11 +4069,49 @@ ); NTSYSAPI +PSTR +NTAPI +RtlIpv6AddressToStringA( + _In_ const struct in6_addr *Addr, + _Out_writes_(46) PSTR S +); + +NTSYSAPI +PWSTR +NTAPI +RtlIpv6AddressToStringW( + _In_ const struct in6_addr *Addr, + _Out_writes_(46) PWSTR S +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv6AddressToStringExA( + _In_ const struct in6_addr *Address, + _In_ ULONG ScopeId, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PSTR AddressString, + _Inout_ PULONG AddressStringLength +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv6AddressToStringExW( + _In_ const struct in6_addr *Address, + _In_ ULONG ScopeId, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString, + _Inout_ PULONG AddressStringLength +); + +NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressA( - _In_ PCHAR Name, - _Out_ PCHAR *Terminator, + _In_ PCSTR String, + _Out_ PCSTR *Terminator, _Out_ struct in6_addr *Addr ); @@ -4046,8 +4119,8 @@ NTSTATUS NTAPI RtlIpv6StringToAddressW( - _In_ PWCHAR Name, - _Out_ PCHAR *Terminator, + _In_ PCWSTR String, + _Out_ PCWSTR *Terminator, _Out_ struct in6_addr *Addr ); @@ -4055,20 +4128,20 @@ NTSTATUS NTAPI RtlIpv6StringToAddressExA( - _In_ PCHAR AddressString, - _In_ struct in6_addr *Address, - _In_ PULONG ScopeId, - _In_ PUSHORT Port + _In_ PCSTR AddressString, + _Out_ struct in6_addr *Address, + _Out_ PULONG ScopeId, + _Out_ PUSHORT Port ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressExW( - _In_ PWCHAR AddressName, - _In_ struct in6_addr *Address, - _In_ PULONG ScopeId, - _In_ PUSHORT Port + _In_ PCWSTR AddressString, + _Out_ struct in6_addr *Address, + _Out_ PULONG ScopeId, + _Out_ PUSHORT Port ); Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6702… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sat Apr 4 07:38:39 2015 @@ -102,9 +102,9 @@ /* * @implemented */ -LPSTR -NTAPI -RtlIpv4AddressToStringA(IN struct in_addr *Addr, +PSTR +NTAPI +RtlIpv4AddressToStringA(IN const struct in_addr *Addr, OUT PCHAR S) { INT Length; @@ -124,7 +124,7 @@ */ NTSTATUS NTAPI -RtlIpv4AddressToStringExA(IN struct in_addr *Address, +RtlIpv4AddressToStringExA(IN const struct in_addr *Address, IN USHORT Port, OUT PCHAR AddressString, IN OUT PULONG AddressStringLength) @@ -156,9 +156,9 @@ /* * @implemented */ -LPWSTR -NTAPI -RtlIpv4AddressToStringW(IN struct in_addr *Addr, +PWSTR +NTAPI +RtlIpv4AddressToStringW(IN const struct in_addr *Addr, OUT PWCHAR S) { INT Length; @@ -177,7 +177,7 @@ */ NTSTATUS NTAPI -RtlIpv4AddressToStringExW(IN struct in_addr *Address, +RtlIpv4AddressToStringExW(IN const struct in_addr *Address, IN USHORT Port, OUT PWCHAR AddressString, IN OUT PULONG AddressStringLength) @@ -388,23 +388,23 @@ /* * @unimplemented */ -NTSTATUS -NTAPI -RtlIpv6AddressToStringA(IN struct in6_addr *Addr, +PSTR +NTAPI +RtlIpv6AddressToStringA(IN const struct in6_addr *Addr, OUT PCHAR S) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* -* @unimplemented -*/ -NTSTATUS -NTAPI -RtlIpv6AddressToStringExA(IN struct in6_addr *Address, + return NULL; +} + +/* +* @unimplemented +*/ +NTSTATUS +NTAPI +RtlIpv6AddressToStringExA(IN const struct in6_addr *Address, IN ULONG ScopeId, - IN ULONG Port, + IN USHORT Port, OUT PCHAR AddressString, IN OUT PULONG AddressStringLength) { @@ -415,21 +415,21 @@ /* * @unimplemented */ -NTSTATUS -NTAPI -RtlIpv6AddressToStringW(IN struct in6_addr *Addr, +PWSTR +NTAPI +RtlIpv6AddressToStringW(IN const struct in6_addr *Addr, OUT PWCHAR S) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* -* @unimplemented -*/ -NTSTATUS -NTAPI -RtlIpv6AddressToStringExW(IN struct in6_addr *Address, + return NULL; +} + +/* +* @unimplemented +*/ +NTSTATUS +NTAPI +RtlIpv6AddressToStringExW(IN const struct in6_addr *Address, IN ULONG ScopeId, IN USHORT Port, IN OUT PWCHAR AddressString, @@ -444,8 +444,8 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressA(IN PCHAR Name, - OUT PCHAR *Terminator, +RtlIpv6StringToAddressA(IN PCSTR Name, + OUT PCSTR *Terminator, OUT struct in6_addr *Addr) { UNIMPLEMENTED; @@ -457,7 +457,7 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExA(IN PCHAR AddressString, +RtlIpv6StringToAddressExA(IN PCSTR AddressString, OUT struct in6_addr *Address, OUT PULONG ScopeId, OUT PUSHORT Port) @@ -471,8 +471,8 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressW(IN PWCHAR Name, - OUT PCHAR *Terminator, +RtlIpv6StringToAddressW(IN PCWSTR Name, + OUT PCWSTR *Terminator, OUT struct in6_addr *Addr) { UNIMPLEMENTED; @@ -484,7 +484,7 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExW(IN PWCHAR AddressName, +RtlIpv6StringToAddressExW(IN PCWSTR AddressName, OUT struct in6_addr *Address, OUT PULONG ScopeId, OUT PUSHORT Port)

1 0

[tfaber] 67028: [RAPPS] - Update README.ENG. Patch by Ismael Ferreras Morezuelas, with review by Jared Smudde CORE-9060
by tfaber＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tfaber Date: Sat Apr 4 06:48:44 2015 New Revision: 67028 URL: http://svn.reactos.org/svn/reactos?rev=67028&view=rev Log: [RAPPS] - Update README.ENG. Patch by Ismael Ferreras Morezuelas, with review by Jared Smudde CORE-9060 Modified: trunk/reactos/base/applications/rapps/README.ENG Modified: trunk/reactos/base/applications/rapps/README.ENG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/RE… ============================================================================== --- trunk/reactos/base/applications/rapps/README.ENG [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/README.ENG [iso-8859-1] Sat Apr 4 06:48:44 2015 @@ -1,44 +1,78 @@ -For more information for RAPPS, see: https://www.reactos.org/wiki/RAPPS +For more information about RAPPS, take a look at <https://reactos.org/wiki/RAPPS> -ADDING DOWNLOADABLE PROGRAMMS +ADDING DOWNLOADABLE PROGRAMS TO THE RAPPS DATABASE +-------------------------------------------------- -For an each programm would be creacted an INI alike syntax. -Also an each field is language inhdepended and individual, an URL's to a source programm is -also maybe different or even nonexisting for anothers languages. -For instance a programm 1C which is mostly interested only for russian users and have no -reason for peoples living in another countries. +Each program entry consists of a text file formatted with an INI-like syntax. -The File Overview: +They must be encoded in UTF-16 LE (Little Endian) or characters out of the ANSI range +will display broken mojibake, some editors like Notepad++ call this format UCS-2 Little Endian. -[Section] -Name = program name -RegName = Name in registry -Version = 1.1.1 -License = GPL -Description = Description -Size = 10 mb -Category = 5 -URLSite = http://www.site.com/ -URLDownload = http://ftp.site.com/pub/installer.exe -CDPath = ; Ïîêà íå èñïîëüçóåòñÿ +If you plan on including your program entry in the ReactOS source code versioning keep in mind +that entries are stored in UTF-8 without BOM (Byte Order Mask) for VCS friendliness. -[Section.0419] ; 0419 - for Russian language -Description = Description in Russian language +They get automatically converted to UTF-16 when creating the compressed rappmgr.cab package, +which is how clients obtain their program lists every time a Database upgrade is triggered. + +Also, each [Section] is language-independent and individual, you can override the URL to a source +program or any other field by adding a language-specific [Section.], followed by the language code. + +NOTE: You can find a complete listing of LCIDs and language names here, includes neutral codes: + <https://msdn.microsoft.com/en-us/library/windows/desktop/dd318693%28v=vs.85…> + +Now RAPPS also accepts neutral language codes, meaning that you can do things like this: + + ; Default English fallback, used if everything else fails. + [Section] + Name = Name in English + + ; Neutral Spanish, used if the specific variant of Spanish does not match. + [Section.0a] + Name = Name in Generic Spanish + + ; Spanish from Spain, used if the system is configured for it. + [Section.0c0a] + Name = Name in Castilian Spanish -Obligatory fields are: Name, Category, URLDownload -Other fields to fill not necessarily. +You can also define an entry without English fallback to make it visible to certain users only. +For instance; software from 1C, which is mostly for Russian speakers and unusable for anyone else. -Categories list: -1 - Audio -2 - Video -3 - Graphics -4 - Games -5 - Internet -6 - Office -7 - Development -8 - Edutainment -9 - Engineering +File format overview: + + ; This is a INI-style comment, useful for adding additional information. + ; Lines starting with a ; character are skipped by the parser. + + [Section] + Name = My fun stuff-o-matic + RegName = Name in Registry + Version = 1.1.1 + License = GPL + Description = Shortish description giving some additional background information about what it does. + Size = 10 MB + Category = 5 + URLSite = https://example.org/ + URLDownload = https://ftp.example.org/pub/installer.exe + CDPath = ; Path in the local filesystem + + [Section.0419] ; 0419 - for Russian language + Description = Description in Russian language + ... + + +The mandatory fields are: Name, Category and URLDownload +All other fields are completely optional and can be skipped. + +List of valid categories: + 1 - Audio + 2 - Video + 3 - Graphics + 4 - Games + 5 - Internet + 6 - Office + 7 - Development + 8 - Edutainment + 9 - Engineering 10 - Finance 11 - Science 12 - Tools @@ -46,11 +80,21 @@ 14 - Libraries 15 - Other -The list downloadable programms is keeping on a server and updating from a server -automatically at first time thes programm is running! -For generating a list of a programm (usually a CAB archive), could be used a batch file CreateCabFile.bat -After downloading (at first time the programm runs around), this file is placing -in the same folder where downloaded programm located to future usage them. -If in some cases an unpacked file is moved, deleted or not exist, then the procedure -to create a new one would be repeated. -If the CAB file is moved, deleted or not exist, then it would be downloaded again. +The official list of downloadable programs is kept on a public ReactOS server +and synced every time RAPPS is launched for the first time. + +NOTE: You can find the most current URL in rapps.h, defined as APPLICATION_DATABASE_URL. + +To generate a RAPPS database (usually a rappmgr.cab archive), use the included scripts: + +For Windows & other NT-derived: CreateCabFile.bat +For Linux & other UNIX flavors: CreateCabFile.sh + + +Once the rappmgr.cab is downloaded to %appdata%\rapps, RAPPS extracts it using cabinet.dll +inside %appdata%\rapps\rapps, after that, it will parse all the *.txt files contained therein. + +Every subsequent time the program tries to access the local .txt files +until a database update is manually triggered by the user. + +If the rappmgr.cab file is moved or just missing, RAPPS will download it again.

1 0

[tfaber] 67027: [SERVICES][ADVAPI32] - Remove old hack member in SC_RPC_CONFIG_INFOA that is no longer necessary and makes info levels other than SERVICE_CONFIG_DESCRIPTION fail. Fixes failure in V...
by tfaber＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tfaber Date: Sat Apr 4 06:30:44 2015 New Revision: 67027 URL: http://svn.reactos.org/svn/reactos?rev=67027&view=rev Log: [SERVICES][ADVAPI32] - Remove old hack member in SC_RPC_CONFIG_INFOA that is no longer necessary and makes info levels other than SERVICE_CONFIG_DESCRIPTION fail. Fixes failure in VMware Tools installer. - Actually save the new service description in RChangeServiceConfigW CORE-9479 #resolve Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Apr 4 06:30:44 2015 @@ -1909,6 +1909,7 @@ goto done; } + wcscpy(lpDisplayNameW, lpDisplayName); if (lpService->lpDisplayName != lpService->lpServiceName) HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); @@ -4816,14 +4817,14 @@ if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { LPSERVICE_DESCRIPTIONW lpServiceDescriptionW; - //LPSERVICE_DESCRIPTIONA lpServiceDescriptionA; - - //lpServiceDescriptionA = Info.psd; - - ///if (lpServiceDescriptionA && - ///lpServiceDescriptionA->lpDescription) - ///{ - dwLength = (DWORD)((strlen(Info.lpDescription) + 1) * sizeof(WCHAR)); + LPSERVICE_DESCRIPTIONA lpServiceDescriptionA; + + lpServiceDescriptionA = Info.psd; + + if (lpServiceDescriptionA && + lpServiceDescriptionA->lpDescription) + { + dwLength = (DWORD)((strlen(lpServiceDescriptionA->lpDescription) + 1) * sizeof(WCHAR)); lpServiceDescriptionW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -4837,14 +4838,14 @@ MultiByteToWideChar(CP_ACP, 0, - Info.lpDescription, + lpServiceDescriptionA->lpDescription, -1, lpServiceDescriptionW->lpDescription, dwLength); ptr = lpServiceDescriptionW; InfoW.psd = lpServiceDescriptionW; - ///} + } } else if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Apr 4 06:30:44 2015 @@ -167,17 +167,16 @@ if (lpInfo == NULL) return TRUE; - /* Fill relevent field of the Info structure */ + /* Fill relevant field of the Info structure */ Info.dwInfoLevel = dwInfoLevel; switch (dwInfoLevel) { case SERVICE_CONFIG_DESCRIPTION: - Info.psd = (LPSERVICE_DESCRIPTIONA)&lpInfo; - Info.lpDescription = ((LPSERVICE_DESCRIPTIONA)lpInfo)->lpDescription; //HACK + Info.psd = lpInfo; break; case SERVICE_CONFIG_FAILURE_ACTIONS: - Info.psfa = (LPSERVICE_FAILURE_ACTIONSA)lpInfo; + Info.psfa = lpInfo; break; default: @@ -225,16 +224,16 @@ if (lpInfo == NULL) return TRUE; - /* Fill relevent field of the Info structure */ + /* Fill relevant field of the Info structure */ Info.dwInfoLevel = dwInfoLevel; switch (dwInfoLevel) { case SERVICE_CONFIG_DESCRIPTION: - Info.psd = (LPSERVICE_DESCRIPTIONW)lpInfo; + Info.psd = lpInfo; break; case SERVICE_CONFIG_FAILURE_ACTIONS: - Info.psfa = (LPSERVICE_FAILURE_ACTIONSW)lpInfo; + Info.psfa = lpInfo; break; default: Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Apr 4 06:30:44 2015 @@ -192,7 +192,6 @@ [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp; [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps; } DUMMYUNIONNAME; - [string] LPSTR lpDescription; //FIXME } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA; typedef struct _SC_RPC_CONFIG_INFOW {

1 0

[tfaber] 67026: [USBCCGP] - Add a DPRINT/ASSERT to USBCCGP_LegacyEnum to test a theory about CORE-9226
by tfaber＠svn.reactos.org 03 Apr '15

03 Apr '15

Author: tfaber Date: Fri Apr 3 20:31:10 2015 New Revision: 67026 URL: http://svn.reactos.org/svn/reactos?rev=67026&view=rev Log: [USBCCGP] - Add a DPRINT/ASSERT to USBCCGP_LegacyEnum to test a theory about CORE-9226 Modified: trunk/reactos/drivers/usb/usbccgp/function.c Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Fri Apr 3 20:31:10 2015 @@ -639,6 +639,11 @@ // // init function descriptors // + if (FDODeviceExtension->FunctionDescriptorCount != 0) + { + DPRINT1("USBCCGP_LegacyEnum called with FunctionDescriptorCount=%lu. Adding another %lu descriptors will probably overflow\n", FDODeviceExtension->FunctionDescriptorCount, FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces); + ASSERT(FDODeviceExtension->FunctionDescriptorCount == 0); + } for (Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) { // get interface descriptor

1 0

[tfaber] 67025: [UMPNPMGR][NEWDEV] - Actually create the "InstallEvent" as an event and use it to communicate success from newdev back to umpnpmgr. This works better than checking the process exit ...
by tfaber＠svn.reactos.org 03 Apr '15

03 Apr '15

Author: tfaber Date: Fri Apr 3 18:30:37 2015 New Revision: 67025 URL: http://svn.reactos.org/svn/reactos?rev=67025&view=rev Log: [UMPNPMGR][NEWDEV] - Actually create the "InstallEvent" as an event and use it to communicate success from newdev back to umpnpmgr. This works better than checking the process exit code from rundll32 (which always returns 0). CORE-9477 #resolve Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/newdev/newdev.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Apr 3 18:30:37 2015 @@ -3016,6 +3016,7 @@ BOOL DeviceInstalled = FALSE; DWORD BytesWritten; DWORD Value; + HANDLE hInstallEvent; HANDLE hPipe = INVALID_HANDLE_VALUE; LPVOID Environment = NULL; PROCESS_INFORMATION ProcessInfo; @@ -3056,7 +3057,7 @@ DPRINT1("Installing: %S\n", DeviceInstance); - /* Create a random UUID for the named pipe */ + /* Create a random UUID for the named pipe & event*/ UuidCreate(&RandomUuid); swprintf(UuidString, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", RandomUuid.Data1, RandomUuid.Data2, RandomUuid.Data3, @@ -3064,11 +3065,20 @@ RandomUuid.Data4[3], RandomUuid.Data4[4], RandomUuid.Data4[5], RandomUuid.Data4[6], RandomUuid.Data4[7]); + /* Create the event */ + wcscpy(InstallEventName, L"Global\\PNP_Device_Install_Event_0."); + wcscat(InstallEventName, UuidString); + hInstallEvent = CreateEventW(NULL, TRUE, FALSE, InstallEventName); + if (!hInstallEvent) + { + DPRINT1("CreateEventW('%ls') failed with error %lu\n", InstallEventName, GetLastError()); + goto cleanup; + } + /* Create the named pipe */ wcscpy(PipeName, L"\\\\.\\pipe\\PNP_Device_Install_Pipe_0."); wcscat(PipeName, UuidString); hPipe = CreateNamedPipeW(PipeName, PIPE_ACCESS_OUTBOUND, PIPE_TYPE_BYTE, 1, 512, 512, 0, NULL); - if (hPipe == INVALID_HANDLE_VALUE) { DPRINT1("CreateNamedPipeW failed with error %u\n", GetLastError()); @@ -3123,9 +3133,6 @@ } /* Pass the data. The following output is partly compatible to Windows XP SP2 (researched using a modified newdev.dll to log this stuff) */ - wcscpy(InstallEventName, L"Global\\PNP_Device_Install_Event_0."); - wcscat(InstallEventName, UuidString); - Value = sizeof(InstallEventName); WriteFile(hPipe, &Value, sizeof(Value), &BytesWritten, NULL); WriteFile(hPipe, InstallEventName, Value, &BytesWritten, NULL); @@ -3141,16 +3148,13 @@ /* Wait for newdev.dll to finish processing */ WaitForSingleObject(ProcessInfo.hProcess, INFINITE); - /* The following check for success is probably not compatible to Windows, but should do its job */ - if (!GetExitCodeProcess(ProcessInfo.hProcess, &Value)) - { - DPRINT1("GetExitCodeProcess failed with error %u\n", GetLastError()); - goto cleanup; - } - - DeviceInstalled = Value; + /* If the event got signalled, this is success */ + DeviceInstalled = WaitForSingleObject(hInstallEvent, 0) == WAIT_OBJECT_0; cleanup: + if (hInstallEvent) + CloseHandle(hInstallEvent); + if (hPipe != INVALID_HANDLE_VALUE) CloseHandle(hPipe); Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Fri Apr 3 18:30:37 2015 @@ -933,6 +933,7 @@ HANDLE hPipe = INVALID_HANDLE_VALUE; PWSTR DeviceInstance = NULL; PWSTR InstallEventName = NULL; + HANDLE hInstallEvent; /* Open the pipe */ hPipe = CreateFileW(lpNamedPipeName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -983,6 +984,21 @@ } ReturnValue = DevInstallW(NULL, NULL, DeviceInstance, ShowWizard ? SW_SHOWNOACTIVATE : SW_HIDE); + if(!ReturnValue) + { + ERR("DevInstallW failed with error %lu\n", GetLastError()); + goto cleanup; + } + + hInstallEvent = CreateEventW(NULL, TRUE, FALSE, InstallEventName); + if(!hInstallEvent) + { + TRACE("CreateEventW('%ls') failed with error %lu\n", InstallEventName, GetLastError()); + goto cleanup; + } + + SetEvent(hInstallEvent); + CloseHandle(hInstallEvent); cleanup: if(hPipe != INVALID_HANDLE_VALUE)

1 0

[gadamopoulos] 67024: [SHELL32] - Implement handling ctrl+A in the shell view control.
by gadamopoulos＠svn.reactos.org 03 Apr '15

03 Apr '15

Author: gadamopoulos Date: Fri Apr 3 16:49:24 2015 New Revision: 67024 URL: http://svn.reactos.org/svn/reactos?rev=67024&view=rev Log: [SHELL32] - Implement handling ctrl+A in the shell view control. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Fri Apr 3 16:49:24 2015 @@ -1601,6 +1601,10 @@ m_ListView.SortItems(ListViewCompareItems, &m_sortInfo); break; + case FCIDM_SHVIEW_SELECTALL: + m_ListView.SetItemState(-1, LVIS_SELECTED, LVIS_SELECTED); + break; + case FCIDM_SHVIEW_REFRESH: Refresh(); break;

1 0

[cwittich] 67023: [MYCOMPUT] now do it properly
by cwittich＠svn.reactos.org 03 Apr '15

03 Apr '15

Author: cwittich Date: Fri Apr 3 14:48:39 2015 New Revision: 67023 URL: http://svn.reactos.org/svn/reactos?rev=67023&view=rev Log: [MYCOMPUT] now do it properly Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] Fri Apr 3 14:48:39 2015 @@ -4,5 +4,4 @@ set_module_type(mycomput win32dll UNICODE ENTRYPOINT 0) -set_module_type(mycomput win32dll UNICODE) add_cd_file(TARGET mycomput DESTINATION reactos/system32 FOR all)

1 0

[cwittich] 67022: [MYCOMPUT] fix build
by cwittich＠svn.reactos.org 03 Apr '15

03 Apr '15

Author: cwittich Date: Fri Apr 3 14:47:47 2015 New Revision: 67022 URL: http://svn.reactos.org/svn/reactos?rev=67022&view=rev Log: [MYCOMPUT] fix build Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] Fri Apr 3 14:47:47 2015 @@ -2,5 +2,7 @@ add_library(mycomput SHARED mycomput.rc) +set_module_type(mycomput win32dll UNICODE ENTRYPOINT 0) + set_module_type(mycomput win32dll UNICODE) add_cd_file(TARGET mycomput DESTINATION reactos/system32 FOR all)

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