Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 59107: [SAMSRV] Set default group membership for new users.
by ekohl＠svn.reactos.org 29 May '13

29 May '13

Author: ekohl Date: Wed May 29 16:09:10 2013 New Revision: 59107 URL: http://svn.reactos.org/svn/reactos?rev=59107&view=rev Log: [SAMSRV] Set default group membership for new users. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed May 29 16:09:10 2013 @@ -2096,6 +2096,7 @@ SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; + GROUP_MEMBERSHIP GroupMembership; UCHAR LogonHours[23]; ULONG ulSize; ULONG ulRid; @@ -2365,7 +2366,22 @@ return Status; } - /* FIXME: Set Groups attribute*/ + /* Set Groups attribute*/ + GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; + GroupMembership.Attributes = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED | + SE_GROUP_ENABLED_BY_DEFAULT; + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + &GroupMembership, + sizeof(GROUP_MEMBERSHIP)); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } /* Set LMPwd attribute*/ Status = SampSetObjectAttribute(UserObject, @@ -7638,6 +7654,7 @@ SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; + GROUP_MEMBERSHIP GroupMembership; UCHAR LogonHours[23]; ULONG ulSize; ULONG ulRid; @@ -7914,7 +7931,22 @@ return Status; } - /* FIXME: Set Groups attribute*/ + /* Set Groups attribute*/ + GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; + GroupMembership.Attributes = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED | + SE_GROUP_ENABLED_BY_DEFAULT; + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + &GroupMembership, + sizeof(GROUP_MEMBERSHIP)); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } /* Set LMPwd attribute*/ Status = SampSetObjectAttribute(UserObject, Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Wed May 29 16:09:10 2013 @@ -168,6 +168,7 @@ ULONG UserAccountControl) { SAM_USER_FIXED_DATA FixedUserData; + GROUP_MEMBERSHIP GroupMembership; UCHAR LogonHours[23]; LPWSTR lpEmptyString = L""; DWORD dwDisposition; @@ -294,7 +295,18 @@ (LPVOID)LogonHours, sizeof(LogonHours)); - /* FIXME: Set Groups attribute*/ + /* Set Groups attribute*/ + GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; + GroupMembership.Attributes = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED | + SE_GROUP_ENABLED_BY_DEFAULT; + + RegSetValueEx(hAccountKey, + L"Groups", + 0, + REG_BINARY, + (LPVOID)&GroupMembership, + sizeof(GROUP_MEMBERSHIP)); /* Set LMPwd attribute*/ RegSetValueEx(hAccountKey,

1 0

[gadamopoulos] 59106: [hivedef.inf] - Fix the names of the colors and sizes of the classic theme. - Fixes CORE-7149
by gadamopoulos＠svn.reactos.org 29 May '13

29 May '13

Author: gadamopoulos Date: Wed May 29 13:23:27 2013 New Revision: 59106 URL: http://svn.reactos.org/svn/reactos?rev=59106&view=rev Log: [hivedef.inf] - Fix the names of the colors and sizes of the classic theme. - Fixes CORE-7149 Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed May 29 13:23:27 2013 @@ -241,7 +241,9 @@ HKCU,"Control Panel\Appearance\New Schemes","SelectedStyle",0x00020000,"0" ; ReactOS Standard HKCU,"Control Panel\Appearance\New Schemes\0","DisplayName",0x00020000,"@themeui.dll,-883" +HKCU,"Control Panel\Appearance\New Schemes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -299,10 +301,11 @@ HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #29",0x00010001,0x006a240a HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #30",0x00010001,0x00c8d0d4 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_0%" ; Brick HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\1","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -360,10 +363,11 @@ HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #30",0x00010001,0x00a5bfc2 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" ; Eggplant HKCU,"Control Panel\Appearance\New Schemes\2","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\2","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -421,10 +425,11 @@ HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color #29",0x00010001,0x00788058 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color #30",0x00010001,0x00a8b090 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" ; Green Olive HKCU,"Control Panel\Appearance\New Schemes\3","DisplayName",0x00020000,"@themeui.dll,-877" +HKCU,"Control Panel\Appearance\New Schemes\3","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -482,10 +487,11 @@ HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color #29",0x00010001,0x00649759 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color #30",0x00010001,0x00a9c8a2 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%" ; High Contrast 1 HKCU,"Control Panel\Appearance\New Schemes\4","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\4","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -543,10 +549,11 @@ HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color #29",0x00010001,0x00008000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" ; High Contrast 2 HKCU,"Control Panel\Appearance\New Schemes\5","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\5","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -604,10 +611,11 @@ HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color #29",0x00010001,0x00ff0000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" ; High Contrast Black HKCU,"Control Panel\Appearance\New Schemes\6","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\6\","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -665,10 +673,11 @@ HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" ; High Contrast White HKCU,"Control Panel\Appearance\New Schemes\7","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\7","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -726,10 +735,11 @@ HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color #29",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color #30",0x00010001,0x00ffffff HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" ; Lilac HKCU,"Control Panel\Appearance\New Schemes\8","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\8","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -787,10 +797,11 @@ HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color #29",0x00010001,0x00b14e5a HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color #30",0x00010001,0x00d9a8ae HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" ; Maple HKCU,"Control Panel\Appearance\New Schemes\9","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\9","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -848,10 +859,11 @@ HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color #29",0x00010001,0x0046a6c6 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color #30",0x00010001,0x00aed8e6 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" ; Marine HKCU,"Control Panel\Appearance\New Schemes\10","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\10","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -909,10 +921,11 @@ HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color #29",0x00010001,0x00800000 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color #30",0x00010001,0x00b8c088 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" ; Plum HKCU,"Control Panel\Appearance\New Schemes\11","DisplayName",0x00020000,"@themeui.dll,-869" +HKCU,"Control Panel\Appearance\New Schemes\11","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%" HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -970,10 +983,11 @@ HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color #30",0x00010001,0x009098a8 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%" ; Pumpkin HKCU,"Control Panel\Appearance\New Schemes\12","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\12","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1031,10 +1045,11 @@ HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color #30",0x00010001,0x009dd5ec HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" ; Rainy Day HKCU,"Control Panel\Appearance\New Schemes\13","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\13","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1092,10 +1107,11 @@ HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color #29",0x00010001,0x007d654f HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color #30",0x00010001,0x00b19983 HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" ; ReactOS Classic HKCU,"Control Panel\Appearance\New Schemes\14","DisplayName",0x00020000,"@themeui.dll,-880" +HKCU,"Control Panel\Appearance\New Schemes\14","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%" HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1153,10 +1169,11 @@ HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color #29",0x00010001,0x00800000 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%" ; Rose HKCU,"Control Panel\Appearance\New Schemes\15","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\15","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1214,10 +1231,11 @@ HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color #29",0x00010001,0x0070609f HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color #30",0x00010001,0x00b7afcf HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" ; Sand HKCU,"Control Panel\Appearance\New Schemes\16","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\16","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%" HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1275,10 +1293,11 @@ HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color #30",0x00010001,0x00bbccd5 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%" ; Sky (WinXP-like) HKCU,"Control Panel\Appearance\New Schemes\17","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\17","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1336,10 +1355,11 @@ HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color #29",0x00010001,0x00c56a31 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color #30",0x00010001,0x00d8e9ec HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" ; Slate HKCU,"Control Panel\Appearance\New Schemes\18","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\18","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1397,10 +1417,11 @@ HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color #29",0x00010001,0x00978055 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color #30",0x00010001,0x00c8b99d HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" ; Storm HKCU,"Control Panel\Appearance\New Schemes\19","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\19","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1458,10 +1479,11 @@ HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" ; Teal HKCU,"Control Panel\Appearance\New Schemes\20","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\20","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1519,10 +1541,11 @@ HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" ; Wheat HKCU,"Control Panel\Appearance\New Schemes\21","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\21","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1580,7 +1603,6 @@ HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color #29",0x00010001,0x00008080 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color #30",0x00010001,0x00a0dede HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" HKCU,"Control Panel\Sound","Beep",2,"yes" HKCU,"Control Panel\Sound","ExtendedSounds",2,"yes" @@ -1875,6 +1897,7 @@ DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp"

1 0

[gadamopoulos] 59105: [desk.cpl] - If loading the name of a classic color fails, try to read it from the "LegacyName" value
by gadamopoulos＠svn.reactos.org 29 May '13

29 May '13

Author: gadamopoulos Date: Wed May 29 13:14:37 2013 New Revision: 59105 URL: http://svn.reactos.org/svn/reactos?rev=59105&view=rev Log: [desk.cpl] - If loading the name of a classic color fails, try to read it from the "LegacyName" value Modified: trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=5… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Wed May 29 13:14:37 2013 @@ -573,6 +573,16 @@ NULL, 0, NULL); + if (Result != ERROR_SUCCESS) + { + Result = RegLoadMUIStringW(hkScheme, + L"LegacyName", + wstrDisplayName, + sizeof(wstrDisplayName), + NULL, + 0, + NULL); + } if (Result == ERROR_SUCCESS) pCurrentStyle = CreateStyle(wstrStyleName, wstrDisplayName);

1 0

[ekohl] 59104: [DISKPART] * Simplified the help system * Removed an unnecessary check in the help system that listed the first help entry 'active' no matter what was entered into the help system, e...
by ekohl＠svn.reactos.org 29 May '13

29 May '13

Author: ekohl Date: Wed May 29 11:40:43 2013 New Revision: 59104 URL: http://svn.reactos.org/svn/reactos?rev=59104&view=rev Log: [DISKPART] * Simplified the help system * Removed an unnecessary check in the help system that listed the first help entry 'active' no matter what was entered into the help system, even if the word is not in the list. * Removed exit_main and rem_main functions since it took a little extra processing time and made the code a bit harder to read. Now it determines if the given command is rem or exit first before looking through the entire function list. * Converted WCHAR* to LPWSTR to make it a bit easier to read. * Add a title to the program to make it easier for the user to determine the name of the application currently running, especially if a large script is being used. Patch by Lee Schroeder. Thanks! CORE-7187 #resolve #comment Committed in r79104. Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/diskpart/active.c trunk/reactos/base/system/diskpart/add.c trunk/reactos/base/system/diskpart/assign.c trunk/reactos/base/system/diskpart/attach.c trunk/reactos/base/system/diskpart/attributes.c trunk/reactos/base/system/diskpart/automount.c trunk/reactos/base/system/diskpart/break.c trunk/reactos/base/system/diskpart/clean.c trunk/reactos/base/system/diskpart/compact.c trunk/reactos/base/system/diskpart/convert.c trunk/reactos/base/system/diskpart/create.c trunk/reactos/base/system/diskpart/delete.c trunk/reactos/base/system/diskpart/detach.c trunk/reactos/base/system/diskpart/detail.c trunk/reactos/base/system/diskpart/diskpart.c trunk/reactos/base/system/diskpart/diskpart.h trunk/reactos/base/system/diskpart/expand.c trunk/reactos/base/system/diskpart/extend.c trunk/reactos/base/system/diskpart/filesystems.c trunk/reactos/base/system/diskpart/format.c trunk/reactos/base/system/diskpart/gpt.c trunk/reactos/base/system/diskpart/help.c trunk/reactos/base/system/diskpart/import.c trunk/reactos/base/system/diskpart/inactive.c trunk/reactos/base/system/diskpart/interpreter.c trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/diskpart/list.c trunk/reactos/base/system/diskpart/merge.c trunk/reactos/base/system/diskpart/offline.c trunk/reactos/base/system/diskpart/online.c trunk/reactos/base/system/diskpart/recover.c trunk/reactos/base/system/diskpart/remove.c trunk/reactos/base/system/diskpart/repair.c trunk/reactos/base/system/diskpart/rescan.c trunk/reactos/base/system/diskpart/resource.h trunk/reactos/base/system/diskpart/retain.c trunk/reactos/base/system/diskpart/san.c trunk/reactos/base/system/diskpart/select.c trunk/reactos/base/system/diskpart/setid.c trunk/reactos/base/system/diskpart/shrink.c trunk/reactos/base/system/diskpart/uniqueid.c Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Wed May 29 11:40:43 2013 @@ -41,7 +41,7 @@ diskpart.rc) set_module_type(diskpart win32cui UNICODE) -add_importlibs(diskpart user32 msvcrt kernel32) +add_importlibs(diskpart user32 msvcrt advapi32 kernel32) if(MSVC) add_importlibs(diskpart ntdll) endif() Modified: trunk/reactos/base/system/diskpart/active.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/activ… ============================================================================== --- trunk/reactos/base/system/diskpart/active.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/active.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,18 +8,9 @@ #include "diskpart.h" -BOOL active_main(INT argc, WCHAR **argv) +BOOL active_main(INT argc, LPWSTR *argv) { printf("\nActive\n"); return TRUE; } - -/* - * help_active(): - * Shows the description and explains each argument type of the active command - */ -VOID help_active(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ACTIVE); -} Modified: trunk/reactos/base/system/diskpart/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/add.c… ============================================================================== --- trunk/reactos/base/system/diskpart/add.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/add.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,16 +8,7 @@ #include "diskpart.h" -BOOL add_main(INT argc, WCHAR **argv) +BOOL add_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_add(): - * Shows the description and explains each argument type of the add command - */ -VOID help_add(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ADD); -} Modified: trunk/reactos/base/system/diskpart/assign.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/assig… ============================================================================== --- trunk/reactos/base/system/diskpart/assign.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/assign.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,16 +7,7 @@ */ #include "diskpart.h" -BOOL assign_main(INT argc, WCHAR **argv) +BOOL assign_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_assign(): - * Shows the description and explains each argument type of the assign command - */ -VOID help_assign(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ASSIGN); -} Modified: trunk/reactos/base/system/diskpart/attach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attac… ============================================================================== --- trunk/reactos/base/system/diskpart/attach.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/attach.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,17 +7,7 @@ */ #include "diskpart.h" -BOOL attach_main(INT argc, WCHAR **argv) +BOOL attach_main(INT argc, LPWSTR *argv) { return TRUE; -} - - -/* - * help_attach(): - * Shows the description and explains each argument type of the attach command - */ -VOID help_attach(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ATTACH); -} +} Modified: trunk/reactos/base/system/diskpart/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attri… ============================================================================== --- trunk/reactos/base/system/diskpart/attributes.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/attributes.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,16 +7,7 @@ */ #include "diskpart.h" -BOOL attributes_main(INT argc, WCHAR **argv) +BOOL attributes_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_attributes(): - * Shows the description and explains each argument type of the attributes command - */ -VOID help_attributes(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ATTRIBUTES); -} Modified: trunk/reactos/base/system/diskpart/automount.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/autom… ============================================================================== --- trunk/reactos/base/system/diskpart/automount.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/automount.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,17 +7,8 @@ */ #include "diskpart.h" -BOOL automount_main(INT argc, WCHAR **argv) +BOOL automount_main(INT argc, LPWSTR *argv) { printf("Automount\n"); return TRUE; } - -/* - * help_automount(): - * Shows the description and explains each argument type of the automount command - */ -VOID help_automount(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_AUTOMOUNT); -} Modified: trunk/reactos/base/system/diskpart/break.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/break… ============================================================================== --- trunk/reactos/base/system/diskpart/break.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/break.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,18 +8,9 @@ */ #include "diskpart.h" -BOOL break_main(INT argc, WCHAR **argv) +BOOL break_main(INT argc, LPWSTR *argv) { printf("\nTODO: Add code later since Win 7 Home Premium doesn't have this feature.\n"); return TRUE; } - -/* - * help_break(): - * Shows the description and explains each argument type of the break command - */ -VOID help_break(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_BREAK); -} Modified: trunk/reactos/base/system/diskpart/clean.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/clean… ============================================================================== --- trunk/reactos/base/system/diskpart/clean.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/clean.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL clean_main(INT argc, WCHAR **argv) +BOOL clean_main(INT argc, LPWSTR *argv) { return TRUE; } - - -/* - * help_clean(): - * Shows the description and explains each argument type of the clean command - */ -VOID help_clean(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_CLEAN); -} Modified: trunk/reactos/base/system/diskpart/compact.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/compa… ============================================================================== --- trunk/reactos/base/system/diskpart/compact.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/compact.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL compact_main(INT argc, WCHAR **argv) +BOOL compact_main(INT argc, LPWSTR *argv) { return 0; } - - -/* - * help_compact(): - * Shows the description and explains each argument type of the compact command - */ -VOID help_compact(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_COMPACT); -} Modified: trunk/reactos/base/system/diskpart/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/conve… ============================================================================== --- trunk/reactos/base/system/diskpart/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/convert.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL convert_main(INT argc, WCHAR **argv) +BOOL convert_main(INT argc, LPWSTR *argv) { return TRUE; } - - -/* - * help_convert(): - * Shows the description and explains each argument type of the convert command - */ -VOID help_convert(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_CONVERT); -} Modified: trunk/reactos/base/system/diskpart/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/creat… ============================================================================== --- trunk/reactos/base/system/diskpart/create.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/create.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL create_main(INT argc, WCHAR **argv) +BOOL create_main(INT argc, LPWSTR *argv) { return TRUE; } - - -/* - * help_create(): - * Shows the description and explains each argument type of the create command - */ -VOID help_create(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_CREATE); -} Modified: trunk/reactos/base/system/diskpart/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/delet… ============================================================================== --- trunk/reactos/base/system/diskpart/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/delete.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,16 +8,7 @@ */ #include "diskpart.h" -BOOL delete_main(INT argc, WCHAR **argv) +BOOL delete_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_delete(): - * Shows the description and explains each argument type of the delete command - */ -VOID help_delete(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_DELETE); -} Modified: trunk/reactos/base/system/diskpart/detach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detac… ============================================================================== --- trunk/reactos/base/system/diskpart/detach.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/detach.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL detach_main(INT argc, WCHAR **argv) +BOOL detach_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_detach(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_DETACH); -} Modified: trunk/reactos/base/system/diskpart/detail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detai… ============================================================================== --- trunk/reactos/base/system/diskpart/detail.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/detail.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL detail_main(INT argc, WCHAR **argv) +BOOL detail_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_detail(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_DETAIL); -} Modified: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -11,7 +11,6 @@ #include "diskpart.h" /* FUNCTIONS ******************************************************************/ - VOID PrintResourceString(INT resID, ...) { @@ -37,7 +36,9 @@ wprintf(L"\n*WARNING*: This program is incomplete and may not work properly.\n"); /* Print the header information */ + wprintf(L"\n"); PrintResourceString(IDS_APP_HEADER); + wprintf(L"\n"); PrintResourceString(IDS_APP_LICENSE); PrintResourceString(IDS_APP_CURR_COMPUTER, szComputerName); } @@ -79,14 +80,21 @@ * wmain(): * Main entry point of the application. */ -int wmain(int argc, const WCHAR *argv[]) +int wmain(int argc, const LPWSTR argv[]) { LPCWSTR script = NULL; LPCWSTR tmpBuffer = NULL; + WCHAR appTitle[50]; int index, timeout; + /* Sets the title of the program so the user will have an easier time + determining the current program, especially if diskpart is running a + script */ + LoadStringW(GetModuleHandle(NULL), IDS_APP_HEADER, (LPWSTR)appTitle, 50); + SetConsoleTitleW(appTitle); + /* Sets the timeout value to 0 just in case the user doesn't - specify a value. */ + specify a value */ timeout = 0; /* If there are no command arguments, then go straight to the interpreter */ Modified: trunk/reactos/base/system/diskpart/diskpart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Wed May 29 11:40:43 2013 @@ -15,6 +15,7 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <wincon.h> #include <winuser.h> #include <stdio.h> #include <stdlib.h> @@ -25,9 +26,10 @@ typedef struct _COMMAND { - WCHAR *name; + LPWSTR name; BOOL (*func)(INT, WCHAR**); - VOID (*help)(INT, WCHAR**); + INT help; + INT help_desc; } COMMAND, *PCOMMAND; extern COMMAND cmds[]; @@ -40,165 +42,126 @@ #define ERROR_SERVICE 4 #define ERROR_SYNTAX 5 -#define DISKPART_VERSION L"0.0.019" - #define MAX_STRING_SIZE 1024 #define MAX_ARGS_COUNT 256 /* PROTOTYPES *****************************************************************/ /* active.c */ -BOOL active_main(INT argc, WCHAR **argv); -VOID help_active(INT argc, WCHAR **argv); +BOOL active_main(INT argc, LPWSTR *argv); /* add.c */ -BOOL add_main(INT argc, WCHAR **argv); -VOID help_add(INT argc, WCHAR **argv); +BOOL add_main(INT argc, LPWSTR *argv); /* assign.c */ -BOOL assign_main(INT argc, WCHAR **argv); -VOID help_assign(INT argc, WCHAR **argv); +BOOL assign_main(INT argc, LPWSTR *argv); /* attach.c */ -BOOL attach_main(INT argc, WCHAR **argv); -VOID help_attach(INT argc, WCHAR **argv); +BOOL attach_main(INT argc, LPWSTR *argv); /* attributes.h */ -VOID help_attributes(INT argc, WCHAR **argv); -BOOL attributes_main(INT argc, WCHAR **argv); +BOOL attributes_main(INT argc, LPWSTR *argv); /* automount.c */ -BOOL automount_main(INT argc, WCHAR **argv); -VOID help_automount(INT argc, WCHAR **argv); +BOOL automount_main(INT argc, LPWSTR *argv); /* break.c */ -BOOL break_main(INT argc, WCHAR **argv); -VOID help_break(INT argc, WCHAR **argv); +BOOL break_main(INT argc, LPWSTR *argv); /* clean.c */ -BOOL clean_main(INT argc, WCHAR **argv); -VOID help_clean(INT argc, WCHAR **argv); +BOOL clean_main(INT argc, LPWSTR *argv); /* compact.c */ -BOOL compact_main(INT argc, WCHAR **argv); -VOID help_compact(INT argc, WCHAR **argv); +BOOL compact_main(INT argc, LPWSTR *argv); /* convert.c */ -BOOL convert_main(INT argc, WCHAR **argv); -VOID help_convert(INT argc, WCHAR **argv); +BOOL convert_main(INT argc, LPWSTR *argv); /* create.c */ -BOOL create_main(INT argc, WCHAR **argv); -VOID help_create(INT argc, WCHAR **argv); +BOOL create_main(INT argc, LPWSTR *argv); /* delete.c */ -BOOL delete_main(INT argc, WCHAR **argv); -VOID help_delete(INT argc, WCHAR **argv); +BOOL delete_main(INT argc, LPWSTR *argv); /* detach.c */ -BOOL detach_main(INT argc, WCHAR **argv); -VOID help_detach(INT argc, WCHAR **argv); +BOOL detach_main(INT argc, LPWSTR *argv); /* detail.c */ -BOOL detail_main(INT argc, WCHAR **argv); -VOID help_detail(INT argc, WCHAR **argv); +BOOL detail_main(INT argc, LPWSTR *argv); /* diskpart.c */ VOID PrintResourceString(INT resID, ...); /* expand.c */ -BOOL expand_main(INT argc, WCHAR **argv); -VOID help_expand(INT argc, WCHAR **argv); +BOOL expand_main(INT argc, LPWSTR *argv); /* extend.c */ -BOOL extend_main(INT argc, WCHAR **argv); -VOID help_extend(INT argc, WCHAR **argv); +BOOL extend_main(INT argc, LPWSTR *argv); /* filesystem.c */ -BOOL filesystems_main(INT argc, WCHAR **argv); -VOID help_filesystems(INT argc, WCHAR **argv); +BOOL filesystems_main(INT argc, LPWSTR *argv); /* format.c */ -BOOL format_main(INT argc, WCHAR **argv); -VOID help_format(INT argc, WCHAR **argv); +BOOL format_main(INT argc, LPWSTR *argv); /* gpt.c */ -BOOL gpt_main(INT argc, WCHAR **argv); -VOID help_gpt(INT argc, WCHAR **argv); +BOOL gpt_main(INT argc, LPWSTR *argv); /* help.c */ -BOOL help_main(INT argc, WCHAR **argv); -VOID help_help(INT argc, WCHAR **argv); +BOOL help_main(INT argc, LPWSTR *argv); VOID help_cmdlist(VOID); -VOID help_print_noerr(VOID); /* import. c */ -BOOL import_main(INT argc, WCHAR **argv); -VOID help_import(INT argc, WCHAR **argv); +BOOL import_main(INT argc, LPWSTR *argv); /* inactive.c */ -BOOL inactive_main(INT argc, WCHAR **argv); -VOID help_inactive(INT argc, WCHAR **argv); +BOOL inactive_main(INT argc, LPWSTR *argv); /* interpreter.c */ -BOOL InterpretScript(WCHAR *line); -BOOL InterpretCmd(INT argc, WCHAR **argv); +BOOL InterpretScript(LPWSTR line); +BOOL InterpretCmd(INT argc, LPWSTR *argv); VOID InterpretMain(VOID); /* list.c */ -BOOL list_main(INT argc, WCHAR **argv); -VOID help_list(INT argc, WCHAR **argv); +BOOL list_main(INT argc, LPWSTR *argv); /* merge.c */ -BOOL merge_main(INT argc, WCHAR **argv); -VOID help_merge(INT argc, WCHAR **argv); +BOOL merge_main(INT argc, LPWSTR *argv); /* offline.c */ -BOOL offline_main(INT argc, WCHAR **argv); -VOID help_offline(INT argc, WCHAR **argv); +BOOL offline_main(INT argc, LPWSTR *argv); /* online.c */ -BOOL online_main(INT argc, WCHAR **argv); -VOID help_online(INT argc, WCHAR **argv); +BOOL online_main(INT argc, LPWSTR *argv); /* recover.c */ -BOOL recover_main(INT argc, WCHAR **argv); -VOID help_recover(INT argc, WCHAR **argv); +BOOL recover_main(INT argc, LPWSTR *argv); /* remove.c */ -BOOL remove_main(INT argc, WCHAR **argv); -VOID help_remove(INT argc, WCHAR **argv); +BOOL remove_main(INT argc, LPWSTR *argv); /* repair.c */ -BOOL repair_main(INT argc, WCHAR **argv); -VOID help_repair(INT argc, WCHAR **argv); +BOOL repair_main(INT argc, LPWSTR *argv); /* rescan.c */ -BOOL rescan_main(INT argc, WCHAR **argv); -VOID help_rescan(INT argc, WCHAR **argv); +BOOL rescan_main(INT argc, LPWSTR *argv); /* retain.c */ -BOOL retain_main(INT argc, WCHAR **argv); -VOID help_retain(INT argc, WCHAR **argv); +BOOL retain_main(INT argc, LPWSTR *argv); /* san.c */ -BOOL san_main(INT argc, WCHAR **argv); -VOID help_san(INT argc, WCHAR **argv); +BOOL san_main(INT argc, LPWSTR *argv); /* select.c */ -BOOL select_main(INT argc, WCHAR **argv); -VOID help_select(INT argc, WCHAR **argv); +BOOL select_main(INT argc, LPWSTR *argv); /* setid.c */ -BOOL setid_main(INT argc, WCHAR **argv); -VOID help_setid(INT argc, WCHAR **argv); +BOOL setid_main(INT argc, LPWSTR *argv); /* shrink.c */ -BOOL shrink_main(INT argc, WCHAR **argv); -VOID help_shrink(INT argc, WCHAR **argv); +BOOL shrink_main(INT argc, LPWSTR *argv); /* uniqueid.c */ -BOOL uniqueid_main(INT argc, WCHAR **argv); -VOID help_uniqueid(INT argc, WCHAR **argv); +BOOL uniqueid_main(INT argc, LPWSTR *argv); #endif /* DISKPART_H */ Modified: trunk/reactos/base/system/diskpart/expand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/expan… ============================================================================== --- trunk/reactos/base/system/diskpart/expand.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/expand.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL expand_main(INT argc, WCHAR **argv) +BOOL expand_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_expand(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_EXPAND); -} Modified: trunk/reactos/base/system/diskpart/extend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/exten… ============================================================================== --- trunk/reactos/base/system/diskpart/extend.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/extend.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL extend_main(INT argc, WCHAR **argv) +BOOL extend_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_extend(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_EXTEND); -} Modified: trunk/reactos/base/system/diskpart/filesystems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/files… ============================================================================== --- trunk/reactos/base/system/diskpart/filesystems.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/filesystems.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL filesystems_main(INT argc, WCHAR **argv) +BOOL filesystems_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_filesystems(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_FILESYSTEMS); -} Modified: trunk/reactos/base/system/diskpart/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/forma… ============================================================================== --- trunk/reactos/base/system/diskpart/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/format.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -3,18 +3,12 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/format.c * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * an interactive way * PROGRAMMERS: Lee Schroeder */ #include "diskpart.h" -BOOL format_main(INT argc, WCHAR **argv) +BOOL format_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_format(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_FORMAT); -} Modified: trunk/reactos/base/system/diskpart/gpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/gpt.c… ============================================================================== --- trunk/reactos/base/system/diskpart/gpt.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/gpt.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,12 +8,7 @@ */ #include "diskpart.h" -BOOL gpt_main(INT argc, WCHAR **argv) +BOOL gpt_main(INT argc, LPWSTR *argv) { return TRUE; } - -VOID help_gpt(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_GPT); -} Modified: trunk/reactos/base/system/diskpart/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/help.… ============================================================================== --- trunk/reactos/base/system/diskpart/help.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/help.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,70 +8,29 @@ #include "diskpart.h" - /* * help_cmdlist(): * shows all the available commands and basic descriptions for diskpart */ VOID help_cmdlist(VOID) { + PCOMMAND cmdptr; + /* Print the header information */ - PrintResourceString(IDS_APP_HEADER, DISKPART_VERSION); + PrintResourceString(IDS_APP_HEADER); + printf("\n"); /* lists all the commands and the basic descriptions */ - PrintResourceString(IDS_HELP_CMD_DESC_ACTIVE); - PrintResourceString(IDS_HELP_CMD_DESC_ADD); - PrintResourceString(IDS_HELP_CMD_DESC_ASSIGN); - PrintResourceString(IDS_HELP_CMD_DESC_ATTACH); - PrintResourceString(IDS_HELP_CMD_DESC_ATTRIBUTES); - PrintResourceString(IDS_HELP_CMD_DESC_AUTOMOUNT); - PrintResourceString(IDS_HELP_CMD_DESC_BREAK); - PrintResourceString(IDS_HELP_CMD_DESC_CLEAN); - PrintResourceString(IDS_HELP_CMD_DESC_COMPACT); - PrintResourceString(IDS_HELP_CMD_DESC_CONVERT); - PrintResourceString(IDS_HELP_CMD_DESC_CREATE); - PrintResourceString(IDS_HELP_CMD_DESC_DELETE); - PrintResourceString(IDS_HELP_CMD_DESC_DETACH); - PrintResourceString(IDS_HELP_CMD_DESC_DETAIL); - PrintResourceString(IDS_HELP_CMD_DESC_EXIT); - PrintResourceString(IDS_HELP_CMD_DESC_EXPAND); - PrintResourceString(IDS_HELP_CMD_DESC_EXTEND); - PrintResourceString(IDS_HELP_CMD_DESC_FS); - PrintResourceString(IDS_HELP_CMD_DESC_FORMAT); - PrintResourceString(IDS_HELP_CMD_DESC_GPT); - PrintResourceString(IDS_HELP_CMD_DESC_HELP); - PrintResourceString(IDS_HELP_CMD_DESC_IMPORT); - PrintResourceString(IDS_HELP_CMD_DESC_INACTIVE); - PrintResourceString(IDS_HELP_CMD_DESC_LIST); - PrintResourceString(IDS_HELP_CMD_DESC_MERGE); - PrintResourceString(IDS_HELP_CMD_DESC_OFFLINE); - PrintResourceString(IDS_HELP_CMD_DESC_ONLINE); - PrintResourceString(IDS_HELP_CMD_DESC_RECOVER); - PrintResourceString(IDS_HELP_CMD_DESC_REM); - PrintResourceString(IDS_HELP_CMD_DESC_REMOVE); - PrintResourceString(IDS_HELP_CMD_DESC_REPAIR); - PrintResourceString(IDS_HELP_CMD_DESC_RESCAN); - PrintResourceString(IDS_HELP_CMD_DESC_RETAIN); - PrintResourceString(IDS_HELP_CMD_DESC_SAN); - PrintResourceString(IDS_HELP_CMD_DESC_SELECT); - PrintResourceString(IDS_HELP_CMD_DESC_SETID); - PrintResourceString(IDS_HELP_CMD_DESC_SHRINK); - PrintResourceString(IDS_HELP_CMD_DESC_UNIQUEID); + for(cmdptr = cmds; cmdptr->name; cmdptr++) + PrintResourceString(cmdptr->help_desc); + printf("\n"); } - - -VOID help_help(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_HELP); -} - - /* help_main(char *arg): * main entry point for the help command. Gives help to users who needs it. */ -BOOL help_main(INT argc, WCHAR **argv) +BOOL help_main(INT argc, LPWSTR *argv) { PCOMMAND cmdptr; @@ -84,9 +43,9 @@ /* Scan internal command table */ for (cmdptr = cmds; cmdptr->name; cmdptr++) { - if (_wcsicmp(argv[1], cmdptr->name) == 0 && cmdptr->help != NULL) + if(_wcsicmp(argv[1], cmdptr->name) == 0) { - cmdptr->help(argc, argv); + PrintResourceString(cmdptr->help); return TRUE; } } Modified: trunk/reactos/base/system/diskpart/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/impor… ============================================================================== --- trunk/reactos/base/system/diskpart/import.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/import.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,12 +8,7 @@ */ #include "diskpart.h" -BOOL import_main(INT argc, WCHAR **argv) +BOOL import_main(INT argc, LPWSTR *argv) { return TRUE; } - -VOID help_import(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_IMPORT); -} Modified: trunk/reactos/base/system/diskpart/inactive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inact… ============================================================================== --- trunk/reactos/base/system/diskpart/inactive.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/inactive.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL inactive_main(INT argc, WCHAR **argv) +BOOL inactive_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_inactive(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_INACTIVE); -} Modified: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… ============================================================================== --- trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -9,68 +9,55 @@ #include "diskpart.h" -BOOL exit_main(INT argc, WCHAR **argv); -BOOL rem_main(INT argc, WCHAR **argv); +BOOL exit_main(INT argc, LPWSTR *argv); +BOOL rem_main(INT argc, LPWSTR *argv); COMMAND cmds[] = { - {L"active", active_main, help_active}, - {L"add", add_main, help_add}, - {L"assign", assign_main, help_assign}, - {L"attributes", attributes_main, help_attributes}, - {L"automount", automount_main, help_automount}, - {L"break", break_main, help_break}, - {L"clean", clean_main, help_clean}, - {L"compact", compact_main, help_compact}, - {L"convert", convert_main, help_convert}, - {L"create", create_main, help_create}, - {L"delete", delete_main, help_delete}, - {L"detail", detail_main, help_detail}, - {L"detach", detach_main, help_detach}, - {L"exit", exit_main, NULL}, - {L"expand", expand_main, help_expand}, - {L"extend", extend_main, help_extend}, - {L"filesystems", filesystems_main, help_filesystems}, - {L"format", format_main, help_format}, - {L"gpt", gpt_main, help_gpt}, - {L"help", help_main, help_help}, - {L"list", list_main, help_list}, - {L"import", import_main, help_import}, - {L"inactive", inactive_main, help_inactive}, - {L"merge", merge_main, help_merge}, - {L"offline", offline_main, help_offline}, - {L"online", online_main, help_online}, - {L"recover", recover_main, help_recover}, - {L"rem", rem_main, NULL}, - {L"remove", remove_main, help_remove}, - {L"repair", repair_main, help_repair}, - {L"rescan", rescan_main, help_rescan}, - {L"retain", retain_main, help_retain}, - {L"san", san_main, help_san}, - {L"select", select_main, help_select}, - {L"setid", setid_main, help_setid}, - {L"shrink", shrink_main, help_shrink}, - {L"uniqueid", uniqueid_main, help_uniqueid}, - {NULL, NULL, NULL} + {L"active", active_main, IDS_HELP_CMD_ACTIVE, IDS_HELP_CMD_DESC_ACTIVE}, + {L"add", add_main, IDS_HELP_CMD_ADD, IDS_HELP_CMD_DESC_ADD}, + {L"assign", assign_main, IDS_HELP_CMD_ASSIGN, IDS_HELP_CMD_DESC_ASSIGN}, + {L"attach", attach_main, IDS_HELP_CMD_ATTACH, IDS_HELP_CMD_DESC_ATTACH}, + {L"attributes", attributes_main, IDS_HELP_CMD_ATTRIBUTES, IDS_HELP_CMD_DESC_ATTRIBUTES}, + {L"automount", automount_main, IDS_HELP_CMD_AUTOMOUNT, IDS_HELP_CMD_DESC_AUTOMOUNT}, + {L"break", break_main, IDS_HELP_CMD_BREAK, IDS_HELP_CMD_DESC_BREAK}, + {L"clean", clean_main, IDS_HELP_CMD_CLEAN, IDS_HELP_CMD_DESC_CLEAN}, + {L"compact", compact_main, IDS_HELP_CMD_COMPACT, IDS_HELP_CMD_DESC_COMPACT}, + {L"convert", convert_main, IDS_HELP_CMD_CONVERT, IDS_HELP_CMD_DESC_CONVERT}, + {L"create", create_main, IDS_HELP_CMD_CREATE, IDS_HELP_CMD_DESC_CREATE}, + {L"delete", delete_main, IDS_HELP_CMD_DELETE, IDS_HELP_CMD_DESC_DELETE}, + {L"detail", detail_main, IDS_HELP_CMD_DETAIL, IDS_HELP_CMD_DESC_DETAIL}, + {L"detach", detach_main, IDS_HELP_CMD_DETACH, IDS_HELP_CMD_DESC_DETACH}, + {L"exit", NULL, IDS_NONE, IDS_HELP_CMD_DESC_EXIT}, + {L"expand", expand_main, IDS_HELP_CMD_EXPAND, IDS_HELP_CMD_DESC_EXPAND}, + {L"extend", extend_main, IDS_HELP_CMD_EXTEND, IDS_HELP_CMD_DESC_EXTEND}, + {L"filesystems", filesystems_main, IDS_HELP_CMD_FILESYSTEMS, IDS_HELP_CMD_DESC_FS}, + {L"format", format_main, IDS_HELP_CMD_FORMAT, IDS_HELP_CMD_DESC_FORMAT}, + {L"gpt", gpt_main, IDS_HELP_CMD_GPT, IDS_HELP_CMD_DESC_GPT}, + {L"help", help_main, IDS_HELP_CMD_HELP, IDS_HELP_CMD_DESC_HELP}, + {L"import", import_main, IDS_HELP_CMD_IMPORT, IDS_HELP_CMD_DESC_IMPORT}, + {L"inactive", inactive_main, IDS_HELP_CMD_INACTIVE, IDS_HELP_CMD_DESC_INACTIVE}, + {L"list", list_main, IDS_HELP_CMD_LIST, IDS_HELP_CMD_DESC_LIST}, + {L"merge", merge_main, IDS_HELP_CMD_MERGE, IDS_HELP_CMD_DESC_MERGE}, + {L"offline", offline_main, IDS_HELP_CMD_OFFLINE, IDS_HELP_CMD_DESC_OFFLINE}, + {L"online", online_main, IDS_HELP_CMD_ONLINE, IDS_HELP_CMD_DESC_ONLINE}, + {L"recover", recover_main, IDS_HELP_CMD_RECOVER, IDS_HELP_CMD_DESC_RECOVER}, + {L"rem", NULL, IDS_NONE, IDS_HELP_CMD_DESC_REM}, + {L"remove", remove_main, IDS_HELP_CMD_REMOVE, IDS_HELP_CMD_DESC_REMOVE}, + {L"repair", repair_main, IDS_HELP_CMD_REPAIR, IDS_HELP_CMD_DESC_REPAIR}, + {L"rescan", rescan_main, IDS_HELP_CMD_RESCAN, IDS_HELP_CMD_DESC_RESCAN}, + {L"retain", retain_main, IDS_HELP_CMD_RETAIN, IDS_HELP_CMD_DESC_RETAIN}, + {L"san", san_main, IDS_HELP_CMD_SAN, IDS_HELP_CMD_DESC_SAN}, + {L"select", select_main, IDS_HELP_CMD_SELECT, IDS_HELP_CMD_DESC_SELECT}, + {L"setid", setid_main, IDS_HELP_CMD_SETID, IDS_HELP_CMD_DESC_SETID}, + {L"shrink", shrink_main, IDS_HELP_CMD_SHRINK, IDS_HELP_CMD_DESC_SHRINK}, + {L"uniqueid", uniqueid_main, IDS_HELP_CMD_UNIQUEID, IDS_HELP_CMD_DESC_UNIQUEID}, + {NULL, NULL, IDS_NONE, IDS_NONE} }; /* FUNCTIONS *****************************************************************/ - -BOOL -exit_main(INT argc, WCHAR **argv) -{ - return FALSE; -} - - -BOOL -rem_main(INT argc, WCHAR **argv) -{ - return TRUE; -} - /* * InterpretCmd(char *cmd_line, char *arg_line): @@ -78,17 +65,23 @@ * determines which function to envoke. */ BOOL -InterpretCmd(int argc, WCHAR **argv) +InterpretCmd(int argc, LPWSTR *argv) { PCOMMAND cmdptr; /* Scan internal command table */ for (cmdptr = cmds; cmdptr->name; cmdptr++) { + /* First, determine if the user wants to exit + or to use a comment */ + if(wcsicmp(argv[0], L"exit") == 0) + return FALSE; + + if(wcsicmp(argv[0], L"rem") == 0) + return TRUE; + if (wcsicmp(argv[0], cmdptr->name) == 0) - { return cmdptr->func(argc, argv); - } } help_cmdlist(); @@ -102,12 +95,12 @@ * The main function used for when reading commands from scripts. */ BOOL -InterpretScript(WCHAR *input_line) +InterpretScript(LPWSTR input_line) { - WCHAR *args_vector[MAX_ARGS_COUNT]; + LPWSTR args_vector[MAX_ARGS_COUNT]; INT args_count = 0; BOOL bWhiteSpace = TRUE; - WCHAR *ptr; + LPWSTR ptr; memset(args_vector, 0, sizeof(args_vector)); @@ -148,11 +141,11 @@ InterpretMain(VOID) { WCHAR input_line[MAX_STRING_SIZE]; - WCHAR *args_vector[MAX_ARGS_COUNT]; + LPWSTR args_vector[MAX_ARGS_COUNT]; INT args_count = 0; BOOL bWhiteSpace = TRUE; BOOL bRun = TRUE; - WCHAR *ptr; + LPWSTR ptr; while (bRun == TRUE) { @@ -180,10 +173,8 @@ args_vector[args_count] = ptr; args_count++; } - bWhiteSpace = FALSE; } - ptr++; } Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Wed May 29 11:40:43 2013 @@ -13,7 +13,7 @@ /* Basic application information */ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_HEADER, "\nReactOS DiskPart\n" + IDS_APP_HEADER, "ReactOS DiskPart" IDS_APP_USAGE, "\nDisk Partitioning Interpreter.\n\n\ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ /S filename\tRuns the given script.\n\ @@ -196,6 +196,13 @@ <Add convert command help text here>\n\n" END +/* Convert help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_CREATE "\n\ +<Add create command help text here>\n\n" +END + /* Delete help description */ STRINGTABLE DISCARDABLE BEGIN @@ -203,6 +210,13 @@ <Add delete command help text here>\n\n" END +/* Delete help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_DETAIL "\n\ +<Add detail command help text here>\n\n" +END + /* Detach help description */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Wed May 29 11:40:43 2013 @@ -15,7 +15,7 @@ /* Basic application information */ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_HEADER, "\nReactOS DiskPart\n" + IDS_APP_HEADER, "ReactOS DiskPart" IDS_APP_USAGE, "Interpretor pentru partiÈionare discuri.\n\nUtilizare: DISKPART [/S numefiÈier] [/T timplimitÄ] [/?]\n\n\ /S numefiÈier\tExecutÄ scriptul din fiÈierul dat.\n\ /T timplimitÄ\tLimitÄ temporalÄ pentru prevenirea utilizÄrii concurente.\n\ @@ -197,6 +197,14 @@ <AdÄugare manual pentru comanda Â«convertÂ»>\n\n" END +/* Convert help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_CREATE "\n\ +<AdÄugare manual pentru comanda Â«createÂ»>\n\n" +END + + /* Delete help description */ STRINGTABLE DISCARDABLE BEGIN @@ -204,6 +212,13 @@ <AdÄugare manual pentru comanda Â«deleteÂ»>\n\n" END +/* Delete help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_DETAIL "\n\ +<AdÄugare manual pentru comanda Â«detailÂ»>\n\n" +END + /* Detach help description */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/system/diskpart/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/list.… ============================================================================== --- trunk/reactos/base/system/diskpart/list.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/list.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -32,42 +32,26 @@ printf("List VDisk!!\n"); } -BOOL list_main(INT argc, WCHAR **argv) +BOOL list_main(INT argc, LPWSTR *argv) { /* gets the first word from the string */ if (argc == 1) { - help_list(0, NULL); + PrintResourceString(IDS_HELP_CMD_LIST); return TRUE; } /* determines which to list (disk, partition, etc.) */ if(!wcsicmp(argv[1], L"disk")) - { list_disk(); - } else if(!wcsicmp(argv[1], L"partition")) - { list_partition(); - } else if(!wcsicmp(argv[1], L"volume")) - { list_volume(); - } else if(!wcsicmp(argv[1], L"vdisk")) - { list_vdisk(); - } else - { - help_list(0, NULL); - } + PrintResourceString(IDS_HELP_CMD_LIST); return TRUE; } - - -VOID help_list(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_LIST); -} Modified: trunk/reactos/base/system/diskpart/merge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/merge… ============================================================================== --- trunk/reactos/base/system/diskpart/merge.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/merge.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL merge_main(INT argc, WCHAR **argv) +BOOL merge_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_merge(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_MERGE); -} Modified: trunk/reactos/base/system/diskpart/offline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/offli… ============================================================================== --- trunk/reactos/base/system/diskpart/offline.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/offline.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL offline_main(INT argc, WCHAR **argv) +BOOL offline_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_offline(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_OFFLINE); -} Modified: trunk/reactos/base/system/diskpart/online.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/onlin… ============================================================================== --- trunk/reactos/base/system/diskpart/online.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/online.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,15 +8,9 @@ */ #include "diskpart.h" -BOOL online_main(INT argc, WCHAR **argv) +BOOL online_main(INT argc, LPWSTR *argv) { - help_online(0, NULL); + PrintResourceString(IDS_HELP_CMD_ONLINE); return TRUE; } - - -VOID help_online(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ONLINE); -} Modified: trunk/reactos/base/system/diskpart/recover.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/recov… ============================================================================== --- trunk/reactos/base/system/diskpart/recover.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/recover.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL recover_main(INT argc, WCHAR **argv) +BOOL recover_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_recover(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_RECOVER); -} Modified: trunk/reactos/base/system/diskpart/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/remov… ============================================================================== --- trunk/reactos/base/system/diskpart/remove.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/remove.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL remove_main(INT argc, WCHAR **argv) +BOOL remove_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_remove(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_REMOVE); -} Modified: trunk/reactos/base/system/diskpart/repair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/repai… ============================================================================== --- trunk/reactos/base/system/diskpart/repair.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/repair.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,15 +8,9 @@ */ #include "diskpart.h" -BOOL repair_main(INT argc, WCHAR **argv) +BOOL repair_main(INT argc, LPWSTR *argv) { printf("\nTODO: Add code later since Win 7 Home Premium doesn't have this feature.\n"); return TRUE; } - - -VOID help_repair(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_REPAIR); -} Modified: trunk/reactos/base/system/diskpart/rescan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resca… ============================================================================== --- trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL rescan_main(INT argc, WCHAR **argv) +BOOL rescan_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_rescan(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_RESCAN); -} Modified: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Wed May 29 11:40:43 2013 @@ -9,6 +9,7 @@ #ifndef RESOURCE_H #define RESOURCE_H +#define IDS_NONE -1 #define IDS_APP_HEADER 0 #define IDS_APP_USAGE 1 #define IDS_APP_LICENSE 2 @@ -16,24 +17,24 @@ #define IDS_APP_LEAVING 4 #define IDS_APP_PROMPT 5 -#define IDS_DETAIL_INFO_DISK_ID 6 -#define IDS_DETAIL_INFO_TYPE 7 -#define IDS_DETAIL_INFO_STATUS 8 -#define IDS_DETAIL_INFO_PATH 9 -#define IDS_DETAIL_INFO_TARGET 10 -#define IDS_DETAIL_INFO_LUN_ID 11 -#define IDS_DETAIL_INFO_LOC_PATH 12 -#define IDS_DETAIL_INFO_CURR_RO_STATE 13 -#define IDS_DETAIL_INFO_RO 14 -#define IDS_DETAIL_INFO_BOOT_DSK 15 -#define IDS_DETAIL_INFO_PAGE_FILE_DSK 16 -#define IDS_DETAIL_INFO_HIBER_FILE_DSK 17 -#define IDS_DETAIL_INFO_CRASH_DSK 18 -#define IDS_DETAIL_INFO_CLST_DSK 19 +#define IDS_DETAIL_INFO_DISK_ID 7 +#define IDS_DETAIL_INFO_TYPE 8 +#define IDS_DETAIL_INFO_STATUS 9 +#define IDS_DETAIL_INFO_PATH 10 +#define IDS_DETAIL_INFO_TARGET 11 +#define IDS_DETAIL_INFO_LUN_ID 12 +#define IDS_DETAIL_INFO_LOC_PATH 13 +#define IDS_DETAIL_INFO_CURR_RO_STATE 14 +#define IDS_DETAIL_INFO_RO 15 +#define IDS_DETAIL_INFO_BOOT_DSK 16 +#define IDS_DETAIL_INFO_PAGE_FILE_DSK 17 +#define IDS_DETAIL_INFO_HIBER_FILE_DSK 18 +#define IDS_DETAIL_INFO_CRASH_DSK 19 +#define IDS_DETAIL_INFO_CLST_DSK 20 -#define IDS_LIST_DISK_HEAD 20 -#define IDS_LIST_DISK_LINE 21 -#define IDS_LIST_VOLUME_HEAD 22 +#define IDS_LIST_DISK_HEAD 21 +#define IDS_LIST_DISK_LINE 22 +#define IDS_LIST_VOLUME_HEAD 23 #define IDS_STATUS_YES 31 #define IDS_STATUS_NO 32 Modified: trunk/reactos/base/system/diskpart/retain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/retai… ============================================================================== --- trunk/reactos/base/system/diskpart/retain.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/retain.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL retain_main(INT argc, WCHAR **argv) +BOOL retain_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_retain(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_RETAIN); -} Modified: trunk/reactos/base/system/diskpart/san.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/san.c… ============================================================================== --- trunk/reactos/base/system/diskpart/san.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/san.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL san_main(INT argc, WCHAR **argv) +BOOL san_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_san(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SAN); -} Modified: trunk/reactos/base/system/diskpart/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/selec… ============================================================================== --- trunk/reactos/base/system/diskpart/select.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/select.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL select_main(INT argc, WCHAR **argv) +BOOL select_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_select(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SELECT); -} Modified: trunk/reactos/base/system/diskpart/setid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/setid… ============================================================================== --- trunk/reactos/base/system/diskpart/setid.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/setid.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL setid_main(INT argc, WCHAR **argv) +BOOL setid_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_setid(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SETID); -} Modified: trunk/reactos/base/system/diskpart/shrink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/shrin… ============================================================================== --- trunk/reactos/base/system/diskpart/shrink.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/shrink.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL shrink_main(INT argc, WCHAR **argv) +BOOL shrink_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_shrink(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SHRINK); -} Modified: trunk/reactos/base/system/diskpart/uniqueid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/uniqu… ============================================================================== --- trunk/reactos/base/system/diskpart/uniqueid.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/uniqueid.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL uniqueid_main(INT argc, WCHAR **argv) +BOOL uniqueid_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_uniqueid(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_UNIQUEID); -}

1 0

[akhaldi] 59103: [ADVPACK_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 29 May '13

29 May '13

Author: akhaldi Date: Wed May 29 11:01:18 2013 New Revision: 59103 URL: http://svn.reactos.org/svn/reactos?rev=59103&view=rev Log: [ADVPACK_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/advpack/advpack.c trunk/rostests/winetests/advpack/files.c trunk/rostests/winetests/advpack/install.c trunk/rostests/winetests/advpack/testlist.c Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… ============================================================================== --- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -19,12 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <stdio.h> -#include <stdarg.h> -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> #include <advpub.h> #include <assert.h> -#include "wine/test.h" +#include <wine/test.h> /* defines for the TranslateInfString/Ex tests */ #define TEST_STRING1 "\\Application Name" Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… ============================================================================== --- trunk/rostests/winetests/advpack/files.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/files.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -18,11 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <stdio.h> -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> #include <advpub.h> #include <fci.h> -#include "wine/test.h" +#include <wine/test.h> /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999 Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install… ============================================================================== --- trunk/rostests/winetests/advpack/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/install.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -18,10 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <stdio.h> -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> #include <advpub.h> -#include "wine/test.h" +#include <wine/test.h> static HMODULE hAdvPack; /* function pointers */ Modified: trunk/rostests/winetests/advpack/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/testlis… ============================================================================== --- trunk/rostests/winetests/advpack/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/testlist.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_advpack(void); extern void func_files(void);

1 0

[akhaldi] 59102: [ADVPACK] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 29 May '13

29 May '13

Author: akhaldi Date: Wed May 29 11:01:08 2013 New Revision: 59102 URL: http://svn.reactos.org/svn/reactos?rev=59102&view=rev Log: [ADVPACK] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/advpack/files.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Wed May 29 11:01:08 2013 @@ -710,6 +710,8 @@ if (!hCabinet) return E_FAIL; + ZeroMemory(&session, sizeof(SESSION)); + pExtract = (void *)GetProcAddress(hCabinet, "Extract"); if (!pExtract) { @@ -717,7 +719,6 @@ goto done; } - ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, ExpandDir); if (FileList) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed May 29 11:01:08 2013 @@ -40,7 +40,7 @@ reactos/dll/directx/quartz # Autosync reactos/dll/win32/activeds # Synced to Wine-1.1.43? reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 -reactos/dll/win32/advpack # Synced to Wine-1.5.19 +reactos/dll/win32/advpack # Synced to Wine-1.5.26 reactos/dll/win32/atl # Synced to Wine-1.5.19 reactos/dll/win32/atl100 # Synced to Wine-1.5.19 reactos/dll/win32/avifil32 # Synced to Wine-1.3.37

1 0

[ekohl] 59101: [CMD] Remove cmd_main(). Patch by Lee Schroeder. Thanks! CORE-7205 #resolve #comment Committed in r59101.
by ekohl＠svn.reactos.org 29 May '13

29 May '13

Author: ekohl Date: Wed May 29 10:56:25 2013 New Revision: 59101 URL: http://svn.reactos.org/svn/reactos?rev=59101&view=rev Log: [CMD] Remove cmd_main(). Patch by Lee Schroeder. Thanks! CORE-7205 #resolve #comment Committed in r59101. Removed: trunk/reactos/base/shell/cmd/main.c Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Wed May 29 10:56:25 2013 @@ -38,7 +38,6 @@ internal.c label.c locale.c - main.c memory.c misc.c mklink.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Wed May 29 10:56:25 2013 @@ -1815,7 +1815,7 @@ /* * main function */ -int cmd_main (int argc, const TCHAR *argv[]) +int _tmain(int argc, const TCHAR *argv[]) { HANDLE hConsole; TCHAR startPath[MAX_PATH]; @@ -1828,7 +1828,7 @@ _tchdir(startPath); SetFileApisToOEM(); - InputCodePage= 0; + InputCodePage = 0; OutputCodePage = 0; hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, @@ -1845,7 +1845,7 @@ CloseHandle(hConsole); } - InputCodePage= GetConsoleCP(); + InputCodePage = GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); CMD_ModuleHandle = GetModuleHandle(NULL); Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Wed May 29 10:56:25 2013 @@ -114,7 +114,6 @@ LPTSTR DoDelayedExpansion(LPTSTR Line); INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore); -int cmd_main (int argc, const TCHAR *argv[]); extern HANDLE CMD_ModuleHandle; Removed: trunk/reactos/base/shell/cmd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/main.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/main.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/main.c (removed) @@ -1,6 +0,0 @@ -#include "precomp.h" - -int _tmain (int argc, const TCHAR *argv[]) -{ - return cmd_main(argc, argv); -}

1 0

[hbelusca] 59100: Let's try to fix GCC builds on Linux bots.
by hbelusca＠svn.reactos.org 29 May '13

29 May '13

Author: hbelusca Date: Wed May 29 00:44:18 2013 New Revision: 59100 URL: http://svn.reactos.org/svn/reactos?rev=59100&view=rev Log: Let's try to fix GCC builds on Linux bots. Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] Wed May 29 00:44:18 2013 @@ -36,11 +36,11 @@ # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) ## NOTE: No need to specify it as we use MSVC :) - #add_target_compile_flags(consrv "/Ze") - ##set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Ze") + ##add_target_compile_flags(consrv "/Ze") + #set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Ze") else() - add_target_compile_flags(consrv "-fms-extensions") - #set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fms-extensions") + #add_target_compile_flags(consrv "-fms-extensions") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fms-extensions") endif() target_link_libraries(consrv win32ksys ${PSEH_LIB} uuid) # win32ksys because of NtUser...()

1 0

[hbelusca] 59099: [CONSOLE.CPL-KERNEL32] Fix some compilation warnings with MSVC. [KERNEL32-CONSRV] - Implement console graphics screen buffers, as described in http://blog.airesoft.co.uk/2012/10/t...
by hbelusca＠svn.reactos.org 29 May '13

29 May '13

Author: hbelusca Date: Wed May 29 00:29:07 2013 New Revision: 59099 URL: http://svn.reactos.org/svn/reactos?rev=59099&view=rev Log: [CONSOLE.CPL-KERNEL32] Fix some compilation warnings with MSVC. [KERNEL32-CONSRV] - Implement console graphics screen buffers, as described in http://blog.airesoft.co.uk/2012/10/things-ms-can-do-that-they-dont-tell-you… . The idea is that the console server creates a memory shared section to be shared with the client console application (it increases performance). A mutex is used to "say" to the console server that he can repaint the screen. The function InvalidateConsoleDIBits is implemented too. The definition of the structure CONSOLE_GRAPHICS_BUFFER_INFO comes directly from the site. - CreateConsoleScreenBuffer was modified to be able to create such buffers. This is needed for a working NTVDM-like application. [CONSRV] - Rework the console buffer structures so that text-mode buffers and graphics-mode buffers can "inherit" from an "abstract" structure, CONSOLE_SCREEN_BUFFER. Add few helper functions for manipulating them. - Reorganize the output code in "graphics.c" and "text.c" files to separate text-mode only code from graphics-mode only code, both in the console server and in the GUI front-end. Other fixes: - Fix mouse handling (left and right clicks when one goes away from the "Selection" mode); do not handle mouse signal when we reactivate the GUI front-end window by a click. - Fix GetLargestConsoleWindowSize API in console server side. Now pressing Alt+F9 in Far Manager to "change" the "video" mode works correctly. Finally: - Start to implement a (fake, i.e. not using directly a VGA driver) console fullscreen mode. Currently Alt-Enter key presses call a stub which just alternates DPRINTing between "switch to fullscreen mode" and "switch to windowed mode". Images here: - Example of an application (a 16-bit emulator by Mysoft) which uses the console graphics screen-buffer functionality: http://img577.imageshack.us/img577/1693/mysoftemulatorargon.png - A potpourri of console applications which use graphics screen-buffers: http://img571.imageshack.us/img571/6526/consoledelirium.png Enjoy :) Added: trunk/reactos/win32ss/user/consrv/frontends/gui/graphics.c (with props) trunk/reactos/win32ss/user/consrv/frontends/gui/text.c (with props) trunk/reactos/win32ss/user/consrv/graphics.c (with props) trunk/reactos/win32ss/user/consrv/text.c (with props) Modified: trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/console/options.c trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/history.c trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/consrv/api.h trunk/reactos/win32ss/user/consrv/coninput.c trunk/reactos/win32ss/user/consrv/conio.h trunk/reactos/win32ss/user/consrv/conoutput.c trunk/reactos/win32ss/user/consrv/conoutput.h trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/consrv.h trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/consrv/handle.c trunk/reactos/win32ss/user/consrv/include/conio.h trunk/reactos/win32ss/user/consrv/include/settings.h trunk/reactos/win32ss/user/consrv/init.c trunk/reactos/win32ss/user/consrv/lineinput.c trunk/reactos/win32ss/user/consrv/settings.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… Modified: trunk/reactos/win32ss/user/consrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/api.h?… Modified: trunk/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… Modified: trunk/reactos/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.… Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… Modified: trunk/reactos/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consrv… Added: trunk/reactos/win32ss/user/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Added: trunk/reactos/win32ss/user/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Added: trunk/reactos/win32ss/user/consrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/graphi… Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… Modified: trunk/reactos/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c… Modified: trunk/reactos/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/linein… Modified: trunk/reactos/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/settin… Added: trunk/reactos/win32ss/user/consrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/text.c…

1 0

[gadamopoulos] 59098: [uxtheme] - Fix almost all of the (few) tests for uxtheme - Do not allow opening or enumerating themes when the themes service is not running
by gadamopoulos＠svn.reactos.org 28 May '13

28 May '13

Author: gadamopoulos Date: Tue May 28 19:19:29 2013 New Revision: 59098 URL: http://svn.reactos.org/svn/reactos?rev=59098&view=rev Log: [uxtheme] - Fix almost all of the (few) tests for uxtheme - Do not allow opening or enumerating themes when the themes service is not running Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Tue May 28 19:19:29 2013 @@ -81,6 +81,9 @@ LPWSTR pszSelectedSize = NULL; LPWSTR tmp; + if (!gbThemeHooksActive) + return E_FAIL; + TRACE("Opening %s\n", debugstr_w(lpThemeFile)); hTheme = LoadLibraryExW(lpThemeFile, NULL, LOAD_LIBRARY_AS_DATAFILE); @@ -168,6 +171,9 @@ (*tf)->pszSelectedColor = pszSelectedColor; (*tf)->pszSelectedSize = pszSelectedSize; (*tf)->dwRefCount = 1; + + TRACE("Theme %p refcount: %d\n", *tf, (*tf)->dwRefCount); + return S_OK; invalid_theme: @@ -183,7 +189,10 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) { if(tf) { + tf->dwRefCount--; + TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); + if(!tf->dwRefCount) { if(tf->hTheme) FreeLibrary(tf->hTheme); if(tf->classes) { @@ -218,6 +227,7 @@ HRESULT MSSTYLES_ReferenceTheme(PTHEME_FILE tf) { tf->dwRefCount++; + TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); return S_OK; } @@ -774,6 +784,7 @@ TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); cls->tf = tf; cls->tf->dwRefCount++; + TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); } return cls; } Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Tue May 28 19:19:29 2013 @@ -50,8 +50,6 @@ static ATOM atSubIdList; ATOM atWndContrext; -static BOOL bThemeActive = FALSE; - static PTHEME_FILE ActiveThemeFile; /***********************************************************************/ @@ -155,6 +153,7 @@ WCHAR szCurrentTheme[MAX_PATH]; WCHAR szCurrentColor[64]; WCHAR szCurrentSize[64]; + BOOL bThemeActive = FALSE; if(bLoad == TRUE) { @@ -472,24 +471,26 @@ WCHAR tmp[2]; HRESULT hr; - if(tf && !bThemeActive) UXTHEME_BackupSystemMetrics(); + if (tf && !ActiveThemeFile) + { + UXTHEME_BackupSystemMetrics(); + } + hr = UXTHEME_SetActiveTheme(tf); - if(FAILED(hr)) + if (FAILED(hr)) return hr; - if(tf) { - bThemeActive = TRUE; - } - else { + + if (!tf) + { UXTHEME_RestoreSystemMetrics(); - bThemeActive = FALSE; } TRACE("Writing theme config to registry\n"); if(!RegCreateKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { - tmp[0] = bThemeActive?'1':'0'; + tmp[0] = ActiveThemeFile?'1':'0'; tmp[1] = '\0'; RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2); - if(bThemeActive) { + if (ActiveThemeFile) { RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)tf->pszSelectedColor, (lstrlenW(tf->pszSelectedColor)+1)*sizeof(WCHAR)); RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)tf->pszSelectedSize, @@ -545,17 +546,42 @@ */ BOOL WINAPI IsAppThemed(void) { - return IsThemeActive(); -} - -/*********************************************************************** - * IsThemeActive (UXTHEME.@) - */ -BOOL WINAPI IsThemeActive(void) -{ TRACE("\n"); SetLastError(ERROR_SUCCESS); - return bThemeActive; + return (ActiveThemeFile != NULL); +} + +/*********************************************************************** + * IsThemeActive (UXTHEME.@) + */ +BOOL WINAPI IsThemeActive(void) +{ + BOOL bActive; + LRESULT Result; + HKEY hKey; + WCHAR tmp[10]; + DWORD buffsize; + + TRACE("\n"); + SetLastError(ERROR_SUCCESS); + + if (ActiveThemeFile) + return TRUE; + + if (gbThemeHooksActive) + return FALSE; + + bActive = FALSE; + Result = RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey); + if (Result == ERROR_SUCCESS) + { + buffsize = sizeof(tmp)/sizeof(tmp[0]); + if (!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) + bActive = (tmp[0] != '0'); + RegCloseKey(hKey); + } + + return bActive; } /*********************************************************************** @@ -571,14 +597,14 @@ TRACE("(%d)\n", fEnable); - if(fEnable != bThemeActive) { + if (fEnable != (ActiveThemeFile != NULL)) { if(fEnable) UXTHEME_BackupSystemMetrics(); else UXTHEME_RestoreSystemMetrics(); UXTHEME_SaveSystemMetrics (); - bThemeActive = fEnable; - if(bThemeActive) szEnabled[0] = '1'; + + if (fEnable) szEnabled[0] = '1'; if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (LPBYTE)szEnabled, sizeof(WCHAR)); RegCloseKey(hKey); @@ -641,7 +667,7 @@ if(flags) FIXME("unhandled flags: %x\n", flags); - if(bThemeActive) + if (ThemeFile) { pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */ @@ -650,10 +676,24 @@ pszUseClassList = pszClassList; if (pszUseClassList) + { + if (!ThemeFile->classes) + MSSTYLES_ParseThemeIni(ThemeFile); hTheme = MSSTYLES_OpenThemeClass(ThemeFile, pszAppName, pszUseClassList); - } + } + } + if(IsWindow(hwnd)) + { SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); + } + else + { + SetLastError(E_PROP_ID_UNSUPPORTED); + } + + SetLastError(hTheme ? ERROR_SUCCESS : E_PROP_ID_UNSUPPORTED); + TRACE(" = %p\n", hTheme); return hTheme; } @@ -667,15 +707,11 @@ } /*********************************************************************** - * OpenThemeDataEx (UXTHEME.16) + * OpenThemeDataFromFile (UXTHEME.16) */ HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, HWND hwnd, LPCWSTR pszClassList, DWORD flags) { - PTHEME_FILE ThemeFile = (PTHEME_FILE)hThemeFile; - - MSSTYLES_ParseThemeIni(ThemeFile); - - return OpenThemeDataInternal(ThemeFile, hwnd, pszClassList, flags); + return OpenThemeDataInternal((PTHEME_FILE)hThemeFile, hwnd, pszClassList, flags); } /*********************************************************************** @@ -700,8 +736,12 @@ HTHEME WINAPI GetWindowTheme(HWND hwnd) { TRACE("(%p)\n", hwnd); + if(!IsWindow(hwnd)) + { SetLastError(E_HANDLE); + return NULL; + } return GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme)); } @@ -719,12 +759,16 @@ debugstr_w(pszSubIdList)); if(!IsWindow(hwnd)) - return E_HANDLE; + return E_HANDLE; hr = UXTHEME_SetWindowProperty(hwnd, atSubAppName, pszSubAppName); - if(SUCCEEDED(hr)) - hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); - if(SUCCEEDED(hr)) + if (!SUCCEEDED(hr)) + return hr; + + hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); + if (!SUCCEEDED(hr)) + return hr; + UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); return hr; } @@ -741,7 +785,7 @@ if(ActiveThemeFile == NULL) return E_PROP_ID_UNSUPPORTED; - if(pszThemeFileName) + if (pszThemeFileName && dwMaxNameChars) { cchar = lstrlenW(ActiveThemeFile->szThemeFile) + 1; if(cchar > dwMaxNameChars) @@ -749,7 +793,7 @@ lstrcpynW(pszThemeFileName, ActiveThemeFile->szThemeFile, cchar); } - if(pszColorBuff) + if (pszColorBuff && cchMaxColorChars) { cchar = lstrlenW(ActiveThemeFile->pszSelectedColor) + 1; if(cchar > cchMaxColorChars) @@ -757,7 +801,7 @@ lstrcpynW(pszColorBuff, ActiveThemeFile->pszSelectedColor, cchar); } - if(pszSizeBuff) + if (pszSizeBuff && cchMaxSizeChars) { cchar = lstrlenW(ActiveThemeFile->pszSelectedSize) + 1; if(cchar > cchMaxSizeChars) Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Tue May 28 19:19:29 2013 @@ -11,16 +11,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); - - -extern HINSTANCE hDllInst; - -LRESULT CALLBACK ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndProc); - USERAPIHOOK user32ApiHook; BYTE gabDWPmessages[UAHOWP_MAX_SIZE]; BYTE gabMSGPmessages[UAHOWP_MAX_SIZE]; - +BOOL gbThemeHooksActive = FALSE; PWND_CONTEXT ThemeGetWndContext(HWND hWnd) { @@ -266,13 +260,15 @@ BOOL CALLBACK ThemeInitApiHook(UAPIHK State, PUSERAPIHOOK puah) { - /* Sanity checks for the caller */ if (!puah || State != uahLoadInit) { UXTHEME_LoadTheme(FALSE); ThemeCleanupWndContext(NULL, 0); + gbThemeHooksActive = FALSE; return TRUE; } + + gbThemeHooksActive = TRUE; /* Store the original functions from user32 */ user32ApiHook = *puah; Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Tue May 28 19:19:29 2013 @@ -199,14 +199,17 @@ /* Minimum size of the rectangle between the arrows */ #define SCROLL_MIN_RECT 4 +LRESULT CALLBACK ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndProc); void ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); VOID NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); void ThemeInitDrawContext(PDRAW_CONTEXT pcontext, HWND hWnd, HRGN hRgn); void ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext); PWND_CONTEXT ThemeGetWndContext(HWND hWnd); +extern HINSTANCE hDllInst; extern ATOM atWindowTheme; extern ATOM atWndContrext; +extern BOOL gbThemeHooksActive; void UXTHEME_InitSystem(HINSTANCE hInst); void UXTHEME_LoadTheme(BOOL bLoad);

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