Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[hpoussin] 32192: Fill output variable before returning

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Feb 7 21:04:03 2008 New Revision: 32192 URL: http://svn.reactos.org/svn/reactos?rev=32192&view=rev Log: Fill output variable before returning Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Feb 7 21:04:03 2008 @@ -1270,6 +1270,7 @@ { /* No resource needed for this device */ DeviceNode->ResourceList = NULL; + *pRequiredSize = 0; return STATUS_SUCCESS; }

16 years, 10 months

[janderwald] 32191: - fix auto timezone selection for bulgarian locale - patch by CCTAHEB See issue #2887 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 7 20:52:24 2008 New Revision: 32191 URL: http://svn.reactos.org/svn/reactos?rev=32191&view=rev Log: - fix auto timezone selection for bulgarian locale - patch by CCTAHEB See issue #2887 for more details. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Thu Feb 7 20:52:24 2008 @@ -138,7 +138,7 @@ "41b", "95",\ "81a", "95",\ "c1a", "95",\ - "402", "100",\ + "402", "125",\ "415", "100",\ "1801", "100",\ "41a", "100",\

16 years, 10 months

[gbrunmar] 32190: * Fixed d3d9 critical section not being unlocked in GetAdapterIdentifier * Implemeted IDirect3D9::GetAdapterMonitor

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Thu Feb 7 20:32:49 2008 New Revision: 32190 URL: http://svn.reactos.org/svn/reactos?rev=32190&view=rev Log: * Fixed d3d9 critical section not being unlocked in GetAdapterIdentifier * Implemeted IDirect3D9::GetAdapterMonitor Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/adapter.h trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Thu Feb 7 20:32:49 2008 @@ -10,10 +10,19 @@ #include <d3d9.h> #include <ddraw.h> #include <strsafe.h> +#include "adapter.h" typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); typedef BOOL (WINAPI *LPFN_DISABLEWOW64FSREDIRECTION) (PVOID*); typedef BOOL (WINAPI *LPFN_REVERTWOW64FSREDIRECTION) (PVOID); + + +typedef struct _ADAPTERMONITOR +{ + LPCSTR lpszDeviceName; + HMONITOR hMonitor; +} ADAPTERMONITOR, *LPADAPTERMONITOR; + static BOOL GetDriverName(LPDISPLAY_DEVICEA pDisplayDevice, D3DADAPTER_IDENTIFIER9* pIdentifier) { @@ -156,3 +165,33 @@ return TRUE; } + +static BOOL CALLBACK AdapterMonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) +{ + MONITORINFOEXA MonitorInfoEx; + LPADAPTERMONITOR lpAdapterMonitor = (LPADAPTERMONITOR)dwData; + + memset(&MonitorInfoEx, 0, sizeof(MONITORINFOEXA)); + MonitorInfoEx.cbSize = sizeof(MONITORINFOEXA); + + GetMonitorInfoA(hMonitor, (LPMONITORINFO)&MonitorInfoEx); + + if (_stricmp(lpAdapterMonitor->lpszDeviceName, MonitorInfoEx.szDevice) == 0) + { + lpAdapterMonitor->hMonitor = hMonitor; + return FALSE; + } + + return TRUE; +} + +HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName) +{ + ADAPTERMONITOR AdapterMonitor; + AdapterMonitor.lpszDeviceName = lpszDeviceName; + AdapterMonitor.hMonitor = NULL; + + EnumDisplayMonitors(NULL, NULL, AdapterMonitorEnumProc, (LPARAM)&AdapterMonitor); + + return AdapterMonitor.hMonitor; +} Modified: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h (original) +++ trunk/reactos/dll/directx/d3d9/adapter.h Thu Feb 7 20:32:49 2008 @@ -11,4 +11,6 @@ BOOL GetAdapterInfo(LPCSTR lpszDeviceName, D3DADAPTER_IDENTIFIER9* pIdentifier); +HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); + #endif Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Thu Feb 7 20:32:49 2008 @@ -18,6 +18,9 @@ LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) { + if (IsBadWritePtr(iface, sizeof(LPDIRECT3D9_INT))) + return NULL; + return (LPDIRECT3D9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3D9_INT, lpVtbl)); } Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Thu Feb 7 20:32:49 2008 @@ -69,7 +69,7 @@ * @param LPDIRECT3D iface * Pointer to the IDirect3D object returned from Direct3DCreate9() * -* @return +* @return UINT * The number of display adapters on the system when Direct3DCreate9() was called. * */ @@ -107,7 +107,7 @@ * Pointer to a D3DADAPTER_IDENTIFIER9 structure to be filled with the available information * about the display adapter. * -* @return +* @return HRESULT * If the method successfully fills the pIdentified structure, the return value is D3D_OK. * If Adapter is out of range, Flags is invalid or pIdentifier is a bad pointer, the return value * will be D3DERR_INVALIDCALL. @@ -148,6 +148,7 @@ return D3DERR_INVALIDCALL; } + UNLOCK_D3D9(); return D3D_OK; } @@ -223,11 +224,43 @@ return D3D_OK; } +/*++ +* @name IDirect3D9::GetAdapterMonitor +* @implemented +* +* The function IDirect3D9Impl_GetAdapterMonitor returns the monitor associated +* with the specified display adapter. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @return HMONITOR +* If the method successfully it returns the HMONITOR belonging to the specified adapter. +* If the method fails, the return value is NULL. +* +*/ static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapter) { - UNIMPLEMENTED - - return NULL; + HMONITOR hAdapterMonitor = NULL; + + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter < This->NumDisplayAdapters) + { + hAdapterMonitor = GetAdapterMonitor(This->DisplayAdapters[Adapter].szDeviceName); + } + else + { + DPRINT1("Invalid Adapter number specified"); + } + + UNLOCK_D3D9(); + return hAdapterMonitor; } static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType,

16 years, 10 months

[cfinck] 32189: Define O_BINARY to 0 in include/wine/port.h if it's not defined. Wine's version of this file already contains this #define. This way we can remove one more difference in our widl version compared to the Wine one.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 7 20:27:25 2008 New Revision: 32189 URL: http://svn.reactos.org/svn/reactos?rev=32189&view=rev Log: Define O_BINARY to 0 in include/wine/port.h if it's not defined. Wine's version of this file already contains this #define. This way we can remove one more difference in our widl version compared to the Wine one. Modified: trunk/reactos/include/reactos/wine/port.h trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h (original) +++ trunk/reactos/include/reactos/wine/port.h Thu Feb 7 20:27:25 2008 @@ -123,6 +123,9 @@ # define O_LARGEFILE 0 #endif +#ifndef O_BINARY +# define O_BINARY 0 +#endif /**************************************************************** * Constants Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Thu Feb 7 20:27:25 2008 @@ -1,6 +1,6 @@ Index: hash.c =================================================================== ---- hash.c (revision 31863) +--- hash.c (revision 32187) +++ hash.c (working copy) @@ -21,9 +21,7 @@ #include <stdio.h> @@ -36,7 +36,7 @@ break; Index: server.c =================================================================== ---- server.c (revision 31863) +--- server.c (revision 32187) +++ server.c (working copy) @@ -390,6 +390,7 @@ print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); @@ -48,7 +48,7 @@ } Index: typelib.c =================================================================== ---- typelib.c (revision 31863) +--- typelib.c (revision 32187) +++ typelib.c (working copy) @@ -35,8 +35,7 @@ #define NONAMELESSUNION @@ -62,7 +62,7 @@ #include "utils.h" Index: utils.c =================================================================== ---- utils.c (revision 31863) +--- utils.c (revision 32187) +++ utils.c (working copy) @@ -136,6 +136,9 @@ name = "widl.tab"; @@ -76,7 +76,7 @@ Index: widl.c =================================================================== ---- widl.c (revision 31863) +--- widl.c (revision 32187) +++ widl.c (working copy) @@ -166,6 +166,9 @@ int i; @@ -90,7 +90,7 @@ token = xstrdup(name); Index: widltypes.h =================================================================== ---- widltypes.h (revision 31863) +--- widltypes.h (revision 32187) +++ widltypes.h (working copy) @@ -21,6 +21,13 @@ #ifndef __WIDL_WIDLTYPES_H @@ -106,21 +106,9 @@ #include <stdarg.h> #include "guiddef.h" #include "wine/rpcfc.h" -@@ -34,6 +41,11 @@ - #define TRUE 1 - #define FALSE 0 - -+// All hosts, which don't define O_BINARY, don't need it :-) -+#ifndef O_BINARY -+#define O_BINARY 0 -+#endif -+ - typedef struct _attr_t attr_t; - typedef struct _expr_t expr_t; - typedef struct _type_t type_t; Index: write_msft.c =================================================================== ---- write_msft.c (revision 31863) +--- write_msft.c (revision 32187) +++ write_msft.c (working copy) @@ -40,10 +40,8 @@ #define NONAMELESSUNION Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Thu Feb 7 20:27:25 2008 @@ -40,11 +40,6 @@ #define TRUE 1 #define FALSE 0 - -// All hosts, which don't define O_BINARY, don't need it :-) -#ifndef O_BINARY -#define O_BINARY 0 -#endif typedef struct _attr_t attr_t; typedef struct _expr_t expr_t;

16 years, 10 months

[gbrunmar] 32188: Fixed a compiler warning with msvc

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Thu Feb 7 20:26:05 2008 New Revision: 32188 URL: http://svn.reactos.org/svn/reactos?rev=32188&view=rev Log: Fixed a compiler warning with msvc Modified: trunk/reactos/dll/directx/d3d9/d3d9.c Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Thu Feb 7 20:26:05 2008 @@ -72,7 +72,7 @@ { if (0 != LoadDebugDll) { - hDebugDll = LoadLibrary("d3d9d.dll"); + hDebugDll = LoadLibraryA("d3d9d.dll"); if (0 != hDebugDll) {

16 years, 10 months

[cfinck] 32187: creat() is equivalent to open() with the flags O_CREAT | O_WRONLY | O_TRUNC. Use these flags and O_BINARY to replace the creat() call we previously had. Requested by Wine for patch acceptance

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 7 17:53:03 2008 New Revision: 32187 URL: http://svn.reactos.org/svn/reactos?rev=32187&view=rev Log: creat() is equivalent to open() with the flags O_CREAT | O_WRONLY | O_TRUNC. Use these flags and O_BINARY to replace the creat() call we previously had. Requested by Wine for patch acceptance Modified: trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Thu Feb 7 17:53:03 2008 @@ -140,7 +140,7 @@ retval = TYPE_E_IOERROR; - fd = creat(typelib->typelib->filename, 0666); -+ fd = open(typelib->typelib->filename, O_CREAT | O_RDWR | O_BINARY, 0666); ++ fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); if (fd == -1) return retval; filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir); Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c (original) +++ trunk/reactos/tools/widl/write_msft.c Thu Feb 7 17:53:03 2008 @@ -2413,7 +2413,7 @@ retval = TYPE_E_IOERROR; - fd = open(typelib->typelib->filename, O_CREAT | O_RDWR | O_BINARY, 0666); + fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); if (fd == -1) return retval; filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir);

16 years, 10 months

[fireball] 32186: - Port LookupAccountNameA/W from Wine. This fixes VMWare Tools crash in NTDLL introduced by msiexec sync.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 7 17:05:10 2008 New Revision: 32186 URL: http://svn.reactos.org/svn/reactos?rev=32186&view=rev Log: - Port LookupAccountNameA/W from Wine. This fixes VMWare Tools crash in NTDLL introduced by msiexec sync. Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Thu Feb 7 17:05:10 2008 @@ -2,13 +2,129 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/misc.c - * PURPOSE: Miscellaneous security functions + * PURPOSE: Miscellaneous security functions (some ported from Wine) */ #include <advapi32.h> #define NDEBUG #include <debug.h> + +/* Needed for LookupAccountNameW implementation from Wine */ + +typedef struct _AccountSid { + WELL_KNOWN_SID_TYPE type; + LPCWSTR account; + LPCWSTR domain; + SID_NAME_USE name_use; +} AccountSid; + +static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR Administrator[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r',0 }; +static const WCHAR Administrators[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0 }; +static const WCHAR ANONYMOUS_LOGON[] = { 'A','N','O','N','Y','M','O','U','S',' ','L','O','G','O','N',0 }; +static const WCHAR Authenticated_Users[] = { 'A','u','t','h','e','n','t','i','c','a','t','e','d',' ','U','s','e','r','s',0 }; +static const WCHAR Backup_Operators[] = { 'B','a','c','k','u','p',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; +static const WCHAR Blank[] = { 0 }; +static const WCHAR BUILTIN[] = { 'B','U','I','L','T','I','N',0 }; +static const WCHAR Cert_Publishers[] = { 'C','e','r','t',' ','P','u','b','l','i','s','h','e','r','s',0 }; +static const WCHAR CREATOR_GROUP[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',0 }; +static const WCHAR CREATOR_GROUP_SERVER[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',' ','S','E','R','V','E','R',0 }; +static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; +static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',' ','S','E','R','V','E','R',0 }; +static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; +static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; +static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; +static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; +static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; +static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; +static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; +static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; +static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; +static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; +static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; +static const WCHAR Group_Policy_Creator_Owners[] = { 'G','r','o','u','p',' ','P','o','l','i','c','y',' ','C','r','e','a','t','o','r',' ','O','w','n','e','r','s',0 }; +static const WCHAR Guest[] = { 'G','u','e','s','t',0 }; +static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; +static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; +static const WCHAR LOCAL[] = { 'L','O','C','A','L',0 }; +static const WCHAR LOCAL_SERVICE[] = { 'L','O','C','A','L',' ','S','E','R','V','I','C','E',0 }; +static const WCHAR NETWORK[] = { 'N','E','T','W','O','R','K',0 }; +static const WCHAR Network_Configuration_Operators[] = { 'N','e','t','w','o','r','k',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR NETWORK_SERVICE[] = { 'N','E','T','W','O','R','K',' ','S','E','R','V','I','C','E',0 }; +static const WCHAR NT_AUTHORITY[] = { 'N','T',' ','A','U','T','H','O','R','I','T','Y',0 }; +static const WCHAR NT_Pseudo_Domain[] = { 'N','T',' ','P','s','e','u','d','o',' ','D','o','m','a','i','n',0 }; +static const WCHAR NTML_Authentication[] = { 'N','T','M','L',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; +static const WCHAR NULL_SID[] = { 'N','U','L','L',' ','S','I','D',0 }; +static const WCHAR Other_Organization[] = { 'O','t','h','e','r',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; +static const WCHAR Performance_Log_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','L','o','g',' ','U','s','e','r','s',0 }; +static const WCHAR Performance_Monitor_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','M','o','n','i','t','o','r',' ','U','s','e','r','s',0 }; +static const WCHAR Power_Users[] = { 'P','o','w','e','r',' ','U','s','e','r','s',0 }; +static const WCHAR Pre_Windows_2000_Compatible_Access[] = { 'P','r','e','-','W','i','n','d','o','w','s',' ','2','0','0','0',' ','C','o','m','p','a','t','i','b','l','e',' ','A','c','c','e','s','s',0 }; +static const WCHAR Print_Operators[] = { 'P','r','i','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR PROXY[] = { 'P','R','O','X','Y',0 }; +static const WCHAR RAS_and_IAS_Servers[] = { 'R','A','S',' ','a','n','d',' ','I','A','S',' ','S','e','r','v','e','r','s',0 }; +static const WCHAR Remote_Desktop_Users[] = { 'R','e','m','o','t','e',' ','D','e','s','k','t','o','p',' ','U','s','e','r','s',0 }; +static const WCHAR REMOTE_INTERACTIVE_LOGON[] = { 'R','E','M','O','T','E',' ','I','N','T','E','R','A','C','T','I','V','E',' ','L','O','G','O','N',0 }; +static const WCHAR Replicators[] = { 'R','e','p','l','i','c','a','t','o','r','s',0 }; +static const WCHAR RESTRICTED[] = { 'R','E','S','T','R','I','C','T','E','D',0 }; +static const WCHAR SChannel_Authentication[] = { 'S','C','h','a','n','n','e','l',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; +static const WCHAR Schema_Admins[] = { 'S','c','h','e','m','a',' ','A','d','m','i','n','s',0 }; +static const WCHAR SELF[] = { 'S','E','L','F',0 }; +static const WCHAR Server_Operators[] = { 'S','e','r','v','e','r',' ','O','p','e','r','a','t','o','r','s',0 }; +static const WCHAR SERVICE[] = { 'S','E','R','V','I','C','E',0 }; +static const WCHAR SYSTEM[] = { 'S','Y','S','T','E','M',0 }; +static const WCHAR TERMINAL_SERVER_USER[] = { 'T','E','R','M','I','N','A','L',' ','S','E','R','V','E','R',' ','U','S','E','R',0 }; +static const WCHAR This_Organization[] = { 'T','h','i','s',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; +static const WCHAR Users[] = { 'U','s','e','r','s',0 }; + +static const AccountSid ACCOUNT_SIDS[] = { + { WinNullSid, NULL_SID, Blank, SidTypeWellKnownGroup }, + { WinWorldSid, Everyone, Blank, SidTypeWellKnownGroup }, + { WinLocalSid, LOCAL, Blank, SidTypeWellKnownGroup }, + { WinCreatorOwnerSid, CREATOR_OWNER, Blank, SidTypeWellKnownGroup }, + { WinCreatorGroupSid, CREATOR_GROUP, Blank, SidTypeWellKnownGroup }, + { WinCreatorOwnerServerSid, CREATOR_OWNER_SERVER, Blank, SidTypeWellKnownGroup }, + { WinCreatorGroupServerSid, CREATOR_GROUP_SERVER, Blank, SidTypeWellKnownGroup }, + { WinNtAuthoritySid, NT_Pseudo_Domain, NT_Pseudo_Domain, SidTypeDomain }, + { WinDialupSid, DIALUP, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinNetworkSid, NETWORK, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinBatchSid, BATCH, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinInteractiveSid, INTERACTIVE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinServiceSid, SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinAnonymousSid, ANONYMOUS_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinProxySid, PROXY, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinEnterpriseControllersSid, ENTERPRISE_DOMAIN_CONTROLLERS, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinSelfSid, SELF, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinAuthenticatedUserSid, Authenticated_Users, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinRestrictedCodeSid, RESTRICTED, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, + { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, + { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, + { WinBuiltinGuestsSid, Guests, BUILTIN, SidTypeAlias }, + { WinBuiltinPowerUsersSid, Power_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinAccountOperatorsSid, Account_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinSystemOperatorsSid, Server_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, + { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, + { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, + { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, + { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinDigestAuthenticationSid, Digest_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinSChannelAuthenticationSid, SChannel_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, +}; /* Interface to ntmarta.dll ***************************************************/ @@ -984,20 +1100,42 @@ /****************************************************************************** * LookupAccountNameA [ADVAPI32.@] * - * @unimplemented + * @implemented */ BOOL STDCALL LookupAccountNameA (LPCSTR SystemName, LPCSTR AccountName, - PSID Sid, - LPDWORD SidLength, - LPSTR ReferencedDomainName, - LPDWORD hReferencedDomainNameLength, - PSID_NAME_USE SidNameUse) -{ - DPRINT1("LookupAccountNameA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + PSID Sid, + LPDWORD SidLength, + LPSTR ReferencedDomainName, + LPDWORD hReferencedDomainNameLength, + PSID_NAME_USE SidNameUse) +{ + BOOL ret; + UNICODE_STRING lpSystemW; + UNICODE_STRING lpAccountW; + LPWSTR lpReferencedDomainNameW = NULL; + + RtlCreateUnicodeStringFromAsciiz(&lpSystemW, SystemName); + RtlCreateUnicodeStringFromAsciiz(&lpAccountW, AccountName); + + if (ReferencedDomainName) + lpReferencedDomainNameW = HeapAlloc(GetProcessHeap(), 0, *hReferencedDomainNameLength * sizeof(WCHAR)); + + ret = LookupAccountNameW(lpSystemW.Buffer, lpAccountW.Buffer, Sid, SidLength, lpReferencedDomainNameW, + hReferencedDomainNameLength, SidNameUse); + + if (ret && lpReferencedDomainNameW) + { + WideCharToMultiByte(CP_ACP, 0, lpReferencedDomainNameW, *hReferencedDomainNameLength, + ReferencedDomainName, *hReferencedDomainNameLength, NULL, NULL); + } + + RtlFreeUnicodeString(&lpSystemW); + RtlFreeUnicodeString(&lpAccountW); + HeapFree(GetProcessHeap(), 0, lpReferencedDomainNameW); + + return ret; } @@ -1006,18 +1144,71 @@ * * @unimplemented */ -BOOL STDCALL -LookupAccountNameW (LPCWSTR SystemName, - LPCWSTR AccountName, - PSID Sid, - LPDWORD SidLength, - LPWSTR ReferencedDomainName, - LPDWORD hReferencedDomainNameLength, - PSID_NAME_USE SidNameUse) -{ - DPRINT1("LookupAccountNameW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +BOOL WINAPI LookupAccountNameW(LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSID Sid, + LPDWORD cbSid, LPWSTR ReferencedDomainName, + LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse) +{ + /* Default implementation: Always return a default SID */ + SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; + BOOL ret; + PSID pSid; + static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + unsigned int i; + + DPRINT("%s %s %p %p %p %p %p - stub\n", lpSystemName, lpAccountName, + Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); + + for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) + { + if (!wcscmp(lpAccountName, ACCOUNT_SIDS[i].account)) + { + if (*cchReferencedDomainName) + *ReferencedDomainName = '\0'; + *cchReferencedDomainName = 0; + *peUse = SidTypeWellKnownGroup; + return CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid); + } + } + + ret = AllocateAndInitializeSid(&identifierAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &pSid); + + if (!ret) + return FALSE; + + if (!RtlValidSid(pSid)) + { + FreeSid(pSid); + return FALSE; + } + + if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) + CopySid(*cbSid, Sid, pSid); + if (*cbSid < GetLengthSid(pSid)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + *cbSid = GetLengthSid(pSid); + + if (ReferencedDomainName != NULL && (*cchReferencedDomainName > wcslen(dm))) + wcscpy(ReferencedDomainName, dm); + + if (*cchReferencedDomainName <= wcslen(dm)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + + *cchReferencedDomainName = wcslen(dm)+1; + + FreeSid(pSid); + + return ret; }

16 years, 10 months

[fireball] 32185: - Apply elf-changes changes to ntkrnlmp.rbuild. - Small formatting fix for ntoskrnl.rbuild.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 7 16:42:29 2008 New Revision: 32185 URL: http://svn.reactos.org/svn/reactos?rev=32185&view=rev Log: - Apply elf-changes changes to ntkrnlmp.rbuild. - Small formatting fix for ntoskrnl.rbuild. Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp.rbuild (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp.rbuild Thu Feb 7 16:42:29 2008 @@ -16,6 +16,9 @@ <define name="_IN_KERNEL_" /> <if property="_WINKD_" value="1"> <define name="_WINKD_" /> + </if> + <if property="_ELF" value="1"> + <define name="_ELF_" /> </if> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> @@ -363,8 +366,10 @@ <file>verifier.c</file> <file>virtual.c</file> <file>wset.c</file> - <file>elf32.c</file> - <file>elf64.c</file> + <if property="_ELF_" value="1"> + <file>elf32.c</file> + <file>elf64.c</file> + </if> </directory> <directory name="ob"> <file>obdir.c</file> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Feb 7 16:42:29 2008 @@ -363,7 +363,7 @@ <if property="_ELF_" value="1"> <file>elf32.c</file> <file>elf64.c</file> - </if> + </if> </directory> <directory name="ob"> <file>obdir.c</file>

16 years, 10 months

[janderwald] 32184: - change cmd "control" to "control.exe" - fix over-translated strings - acquire full path for the traget executable and directly invoke CreateProcess - zero initialize param szTemp to fix a possible buffer overflow - fixes bug 3027

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 7 14:23:38 2008 New Revision: 32184 URL: http://svn.reactos.org/svn/reactos?rev=32184&view=rev Log: - change cmd "control" to "control.exe" - fix over-translated strings - acquire full path for the traget executable and directly invoke CreateProcess - zero initialize param szTemp to fix a possible buffer overflow - fixes bug 3027 Modified: trunk/reactos/base/applications/msconfig/lang/bg-BG.rc trunk/reactos/base/applications/msconfig/lang/ca-ES.rc trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig/lang/de-DE.rc trunk/reactos/base/applications/msconfig/lang/el-GR.rc trunk/reactos/base/applications/msconfig/lang/en-US.rc trunk/reactos/base/applications/msconfig/lang/fr-FR.rc trunk/reactos/base/applications/msconfig/lang/hu-HU.rc trunk/reactos/base/applications/msconfig/lang/id-ID.rc trunk/reactos/base/applications/msconfig/lang/it-IT.rc trunk/reactos/base/applications/msconfig/lang/nb-NO.rc trunk/reactos/base/applications/msconfig/lang/nl-NL.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pt-BR.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/th-TH.rc trunk/reactos/base/applications/msconfig/lang/uk-UA.rc trunk/reactos/base/applications/msconfig/lang/zh-CN.rc trunk/reactos/base/applications/msconfig/msconfig.rbuild trunk/reactos/base/applications/msconfig/precomp.h trunk/reactos/base/applications/msconfig/toolspage.c Modified: trunk/reactos/base/applications/msconfig/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/bg-BG.rc Thu Feb 7 14:23:38 2008 @@ -158,7 +158,7 @@ IDS_TOOLS_SYSDM_NAME "Ñâîéñòâà íà ñèñòåìàòà" IDS_TOOLS_SYSDM_DESCR "Äàâà ñâåäåíèÿ çàêîìïþòúðà." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Ïðåäìåò" Modified: trunk/reactos/base/applications/msconfig/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ca-ES.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Propietats del sistema" IDS_TOOLS_SYSDM_DESCR "Mostra la informacio d'aquest ordinador." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Systém" IDS_TOOLS_SYSDM_DESCR "Zobrazí informace o systému." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Poloka" Modified: trunk/reactos/base/applications/msconfig/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/de-DE.rc Thu Feb 7 14:23:38 2008 @@ -158,7 +158,7 @@ IDS_TOOLS_SYSDM_NAME "Systemeigenschaften" IDS_TOOLS_SYSDM_DESCR "Zeigt Informationen über diesen Rechner an." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/el-GR.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Éäéüôçôåò óõóôÞìáôïò" IDS_TOOLS_SYSDM_DESCR "Åìöáíßæåé ðëçñïöïñßåò ãéá áõôüí ôïí õðïëïãéóôÞ." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/en-US.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/en-US.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "System properties" IDS_TOOLS_SYSDM_DESCR "Shows information about this computer." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/fr-FR.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Propriétés système" IDS_TOOLS_SYSDM_DESCR "Affiche/modifie des information à propos de l'ordinateur." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Elément" Modified: trunk/reactos/base/applications/msconfig/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/hu-HU.rc Thu Feb 7 14:23:38 2008 @@ -159,7 +159,7 @@ IDS_TOOLS_SYSDM_NAME "Rendszertulajdonságok" IDS_TOOLS_SYSDM_DESCR "Megjeleníti a számítógép információkat." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/id-ID.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Properti Sistem" IDS_TOOLS_SYSDM_DESCR "Menampilkan informasi mengenai komputer ini." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Elemen" Modified: trunk/reactos/base/applications/msconfig/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/it-IT.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "Proprietà del sistema" IDS_TOOLS_SYSDM_DESCR "Mostra informazioni su questo pc." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Elemento" Modified: trunk/reactos/base/applications/msconfig/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/nb-NO.rc Thu Feb 7 14:23:38 2008 @@ -157,7 +157,7 @@ IDS_TOOLS_SYSDM_NAME "System egenskaper" IDS_TOOLS_SYSDM_DESCR "Vis informasjon om denne datamaskinen." - IDS_TOOLS_SYSDM_CMD "kontroll" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/nl-NL.rc Thu Feb 7 14:23:38 2008 @@ -177,7 +177,7 @@ IDS_TOOLS_SYSDM_NAME "Systeemeigenschappen" IDS_TOOLS_SYSDM_DESCR "Toont informatie over deze computer" - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/pl-PL.rc Thu Feb 7 14:23:38 2008 @@ -163,7 +163,7 @@ IDS_TOOLS_SYSDM_NAME "W³aciwoci systemu" IDS_TOOLS_SYSDM_DESCR "Pokazuje informacje o tym komputerze." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" Modified: trunk/reactos/base/applications/msconfig/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/pt-BR.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/pt-BR.rc Thu Feb 7 14:23:38 2008 @@ -163,7 +163,7 @@ IDS_TOOLS_SYSDM_NAME "Propriedades do sistema" IDS_TOOLS_SYSDM_DESCR "Mostra informações sobre este computador." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Item de inicialização" Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ru-RU.rc Thu Feb 7 14:23:38 2008 @@ -159,7 +159,7 @@ IDS_TOOLS_SYSDM_NAME "Íàñòðîéêè ñèñòåìû" IDS_TOOLS_SYSDM_DESCR "Ïîêàçàòü èíôîðìàöèþ îá ýòîì êîìïüþòåðå." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Ýëåìåíò" Modified: trunk/reactos/base/applications/msconfig/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/th-TH.rc Thu Feb 7 14:23:38 2008 @@ -177,7 +177,7 @@ IDS_TOOLS_SYSDM_NAME "¤Ø³ÊÁºÑµÔ¢Í§ÃÐºº" IDS_TOOLS_SYSDM_DESCR "áÊ´§¢éÍÁÙÅà¡ÕèÂÇ¡Ñº¤ÍÁ¾ÔÇàµÍÃì¹Õé" - IDS_TOOLS_SYSDM_CMD "ÊèÇ¹¤Çº¤ØÁ" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "ÊèÇ¹»ÃÐ¡Íº" Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/uk-UA.rc Thu Feb 7 14:23:38 2008 @@ -165,7 +165,7 @@ IDS_TOOLS_SYSDM_NAME "Âëàñòèâîñò³ ñèñòåìè" IDS_TOOLS_SYSDM_DESCR "Ïîêàçóº ³íôîðìàö³þ ïðî êîìï'þòåð." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Åëåìåíò" Modified: trunk/reactos/base/applications/msconfig/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/zh-CN.rc Thu Feb 7 14:23:38 2008 @@ -177,7 +177,7 @@ IDS_TOOLS_SYSDM_NAME "ÏµÍ³ÊôÐÔ" IDS_TOOLS_SYSDM_DESCR "ÏÔÊ¾ÕâÌ¨¼ÆËã»úµÄÊôÐÔ" - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Æô¶¯ÏîÄ¿" Modified: trunk/reactos/base/applications/msconfig/msconfig.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rbuild (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rbuild Thu Feb 7 14:23:38 2008 @@ -12,6 +12,7 @@ <library>version</library> <library>comctl32</library> <library>shell32</library> + <library>shlwapi</library> <compilationunit name="unit.c"> <file>toolspage.c</file> <file>srvpage.c</file> Modified: trunk/reactos/base/applications/msconfig/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/precomp.h (original) +++ trunk/reactos/base/applications/msconfig/precomp.h Thu Feb 7 14:23:38 2008 @@ -4,6 +4,8 @@ #include <winuser.h> #include <tchar.h> #include <stdio.h> +#include <shlwapi.h> +#include <shlobj.h> #include "resource.h" #include "msconfig.h" Modified: trunk/reactos/base/applications/msconfig/toolspage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/toolspage.c (original) +++ trunk/reactos/base/applications/msconfig/toolspage.c Thu Feb 7 14:23:38 2008 @@ -13,13 +13,14 @@ HWND hToolsListCtrl; HWND hToolsDialog; -void AddItem ( DWORD, DWORD, DWORD, DWORD ); +void AddItem ( DWORD, DWORD, DWORD, DWORD, int ); void FillListView ( void ); DWORD ListItems_Cmds[20]; DWORD ListItems_Params[20]; +DWORD ListItems_Locations[20]; -void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id ) { +void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id, int csidl ) { TCHAR szTemp[256]; LV_ITEM item; @@ -34,6 +35,7 @@ ListItems_Cmds[item.iItem] = cmd_id; ListItems_Params[item.iItem] = param_id; + ListItems_Locations[item.iItem] = csidl; LoadString(hInst, descr_id, szTemp, 256); item.pszText = szTemp; @@ -42,21 +44,24 @@ } void FillListView ( void ) { - AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM); - AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM); - AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM); - AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM); + AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM, CSIDL_SYSTEM); + AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM, CSIDL_WINDOWS); + AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM, CSIDL_SYSTEM); + AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM, CSIDL_SYSTEM); } INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { LV_COLUMN column; - TCHAR szTemp[256]; + TCHAR szTemp[MAX_PATH*2]; TCHAR szTemp2[256]; + TCHAR * Ptr = NULL; LPNMITEMACTIVATE lpnmitem; LPNMHDR nmh; DWORD dwStyle; + PROCESS_INFORMATION pi; + STARTUPINFO si; switch (message) { @@ -96,9 +101,27 @@ { if (ListView_GetSelectionMark(hToolsListCtrl) != -1) { - LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], szTemp, 256); + if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) + Ptr = PathAddBackslash(szTemp); + + if (!Ptr) + Ptr = szTemp; + + szTemp2[0] = _T('\0'); + LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], Ptr, 256); LoadString(hInst, ListItems_Params[ListView_GetSelectionMark(hToolsListCtrl)], szTemp2, 256); - ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + if (_tcslen(szTemp2)) + { + _tcscat(szTemp, _T(" ")); + _tcscat(Ptr, szTemp2); + } + ZeroMemory(&si, sizeof(STARTUPINFO)); + si.cb = sizeof(STARTUPINFO); + if (CreateProcess(NULL, szTemp, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } } } } @@ -117,6 +140,7 @@ if (lpnmitem->iItem > -1) { LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + szTemp2[0] = _T('\0'); LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); _tcscat(szTemp, _T(" ")); _tcscat(szTemp, szTemp2); @@ -129,9 +153,27 @@ lpnmitem = (LPNMITEMACTIVATE) lParam; if (lpnmitem->iItem > -1) { - LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) + Ptr = PathAddBackslash(szTemp); + + if (!Ptr) + Ptr = szTemp; + + szTemp2[0] = _T('\0'); + LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], Ptr, 256); LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); - ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + if (_tcslen(szTemp2)) + { + _tcscat(szTemp, _T(" ")); + _tcscat(Ptr, szTemp2); + } + ZeroMemory(&si, sizeof(STARTUPINFO)); + si.cb = sizeof(STARTUPINFO); + if (CreateProcess(NULL, szTemp, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } } break; }

16 years, 10 months

[janderwald] 32183: - improve control a bit so it that can execute cpl specified on the command line - ignore the function index, page index for now

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 7 14:21:10 2008 New Revision: 32183 URL: http://svn.reactos.org/svn/reactos?rev=32183&view=rev Log: - improve control a bit so it that can execute cpl specified on the command line - ignore the function index, page index for now Modified: trunk/reactos/base/applications/control/control.c Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.c (original) +++ trunk/reactos/base/applications/control/control.c Thu Feb 7 14:21:10 2008 @@ -404,6 +404,7 @@ _tmain(int argc, const TCHAR *argv[]) { STARTUPINFO si; + TCHAR * szExt; si.cb = sizeof(si); GetStartupInfo(&si); @@ -436,6 +437,22 @@ { return RunControlPanel(_T("main.cpl"), 1); } + else if ((szExt = _tcsstr(argv[1], _T(".cpl")))) + { + TCHAR * szSep; + TCHAR szCPL[MAX_PATH]; + UINT selPage = 0; + + _tcscpy(szCPL, argv[1]); + szSep = _tcsstr(szCPL, _T(".cpl,")); + + if (szSep) + { + /* FIXME for now ignore page index */ + szSep[4] = _T('\0'); + } + return RunControlPanel(szCPL, selPage); + } return 0; }

16 years, 10 months

← Newer
1
...
32
33
34
35
36
37
38
...
46
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 February 2008