[ros-diffs] [hbelusca] 59112: [KERNEL32-CONSRV] - Implement ConsoleMenuControl; see http://undoc.airesoft.co.uk/kernel32.dll/ConsoleMenuControl.php for more information. - Implement SetConsoleMenuClos
Author: hbelusca
Date: Thu May 30 00:50:03 2013
New Revision: 59112
URL: http://svn.reactos.org/svn/reactos?rev=59112&view=rev
Log:
[KERNEL32-CONSRV]
- Implement ConsoleMenuControl; see
http://undoc.airesoft.co.uk/kernel32.dll/ConsoleMenuControl.php for more
information.
- Implement SetConsoleMenuClose; see
http://www.mail-archive.com/harbour@harbour-project.org/msg27509.html (or
http://harbour-devel.1590103.n2.nabble.com/Question-about-hb-gt-win-CtrlHandler-usage-td4670862i20.html
) for more information.
[CONSRV]
Remove two unneeded DPRINTs.
Modified:
trunk/reactos/dll/win32/kernel32/client/console/console.c
trunk/reactos/include/psdk/wincon.h
trunk/reactos/include/reactos/subsys/win/conmsg.h
trunk/reactos/win32ss/user/consrv/api.h
trunk/reactos/win32ss/user/consrv/conio.h
trunk/reactos/win32ss/user/consrv/console.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/include/conio.h
trunk/reactos/win32ss/user/consrv/init.c
Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/console/console.c?rev=59112&r1=59111&r2=59112&view=diff
==
--- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1]
Thu May 30 00:50:03 2013
@@ -240,17 +240,29 @@
/*
- * @unimplemented (Undocumented)
- */
-BOOL
-WINAPI
-ConsoleMenuControl(HANDLE hConsole,
- DWORD Unknown1,
- DWORD Unknown2)
-{
-DPRINT1("ConsoleMenuControl(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", hConsole,
Unknown1, Unknown2);
-SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-return FALSE;
+ * @implemented (Undocumented)
+ * @note See http://undoc.airesoft.co.uk/kernel32.dll/ConsoleMenuControl.php
+ */
+HMENU
+WINAPI
+ConsoleMenuControl(HANDLE hConsoleOutput,
+ DWORD dwCmdIdLow,
+ DWORD dwCmdIdHigh)
+{
+CONSOLE_API_MESSAGE ApiMessage;
+PCONSOLE_MENUCONTROL MenuControlRequest =
&ApiMessage.Data.MenuControlRequest;
+
+MenuControlRequest->OutputHandle = hConsoleOutput;
+MenuControlRequest->dwCmdIdLow = dwCmdIdLow;
+MenuControlRequest->dwCmdIdHigh = dwCmdIdHigh;
+MenuControlRequest->hMenu= NULL;
+
+CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+NULL,
+CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX,
ConsolepMenuControl),
+sizeof(CONSOLE_MENUCONTROL));
+
+return MenuControlRequest->hMenu;
}
@@ -654,15 +666,29 @@
/*
- * @unimplemented (Undocumented)
- */
-BOOL
-WINAPI
-SetConsoleMenuClose(DWORD Unknown0)
-{
-DPRINT1("SetConsoleMenuClose(0x%x) UNIMPLEMENTED!\n", Unknown0);
-SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-return FALSE;
+ * @implemented (Undocumented)
+ */
+BOOL
+WINAPI
+SetConsoleMenuClose(BOOL bEnable)
+{
+NTSTATUS Status;
+CONSOLE_API_MESSAGE ApiMessage;
+PCONSOLE_SETMENUCLOSE SetMenuCloseRequest =
&ApiMessage.Data.SetMenuCloseRequest;
+
+SetMenuCloseRequest->Enable = bEnable;
+
+Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+ NULL,
+ CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX,
ConsolepSetMenuClose),
+ sizeof(CONSOLE_SETMENUCLOSE));
+if (!NT_SUCCESS(Status))
+{
+BaseSetLastNTError(Status);
+return FALSE;
+}
+
+return TRUE;
}
Modified: trunk/reactos/include/psdk/wincon.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=59112&r1=59111&r2=59112&view=diff
==
--- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Thu May 30 00:50:03 2013
@@ -451,6 +451,12 @@
BOOL WINAPI SetConsoleTitleA(_In_ LPCSTR);
BOOL WINAPI SetConsoleTitleW(_In_ LPCWSTR);
BOOL WINAPI SetConsoleWindowInfo(_In_ HANDLE, _In_ BOOL, _In_ const
SMALL_RECT*);
+
+/* Undocumented, see
http://undoc.airesoft.co.uk/kernel32.dll/ConsoleMenuControl.php */
+HMENU WINAPI ConsoleMenuControl(_In_ HANDLE, _In_ DWORD, _In_ DWORD);
+/* Undocumented */
+BOOL WINAPI SetConsoleMenuClose(_In_ BOOL);
+
BOOL WINAPI WriteConsoleA(HANDLE,CONST VOID*,DWORD,LPDWORD,LPVOID);
BOOL WINAPI WriteConsoleW(HANDLE,CONST VOID*,DWORD,LPDWORD,LPVOID);
Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win/conmsg.h?rev=59112&r1=59111&r2=59112&view=diff
==
[ros-diffs] [cwittich] 59111: [dxdiag] use unicode structures when using unicode functions
Author: cwittich
Date: Wed May 29 20:36:22 2013
New Revision: 59111
URL: http://svn.reactos.org/svn/reactos?rev=59111&view=rev
Log:
[dxdiag]
use unicode structures when using unicode functions
Modified:
trunk/reactos/base/applications/dxdiag/display.c
trunk/reactos/base/applications/dxdiag/dxdiag.c
Modified: trunk/reactos/base/applications/dxdiag/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/display.c?rev=59111&r1=59110&r2=59111&view=diff
==
--- trunk/reactos/base/applications/dxdiag/display.c[iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/display.c[iso-8859-1] Wed May 29
20:36:22 2013
@@ -213,7 +213,7 @@
HKEY hKey;
HWND hDlgCtrls[5];
DWORD dwMemory;
-DEVMODE DevMode;
+DEVMODEW DevMode;
IDirect3D9 * ppObj;
D3DADAPTER_IDENTIFIER9 Identifier;
HRESULT hResult;
@@ -276,7 +276,7 @@
}
/* retrieve current display mode */
-DevMode.dmSize = sizeof(DEVMODE);
+DevMode.dmSize = sizeof(DEVMODEW);
if (EnumDisplaySettingsW(pDispDevice->DeviceName, ENUM_CURRENT_SETTINGS,
&DevMode))
{
szFormat[0] = L'\0';
Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/dxdiag.c?rev=59111&r1=59110&r2=59111&view=diff
==
--- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Wed May 29
20:36:22 2013
@@ -50,7 +50,7 @@
TCITEMW item;
/* setup item info */
-memset(&item, 0, sizeof(TCITEM));
+memset(&item, 0, sizeof(TCITEMW));
item.mask = TCIF_TEXT;
/* load item name */
[ros-diffs] [gadamopoulos] 59110: [syssetup] - Create shortcuts based on shortcuts.inf instead of hardcoding them Note to translators: please make sure that all shortcut translations are correct. Seve
Author: gadamopoulos
Date: Wed May 29 20:33:11 2013
New Revision: 59110
URL: http://svn.reactos.org/svn/reactos?rev=59110&view=rev
Log:
[syssetup]
- Create shortcuts based on shortcuts.inf instead of hardcoding them
Note to translators: please make sure that all shortcut translations are
correct. Several localized strings had to be copied by hand so there is the
possibility that some errors exist
Modified:
trunk/reactos/dll/win32/syssetup/install.c
Modified: trunk/reactos/dll/win32/syssetup/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install.c?rev=59110&r1=59109&r2=59110&view=diff
==
--- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed May 29
20:33:11 2013
@@ -127,19 +127,15 @@
static BOOL
CreateShortcut(
-int csidl,
LPCTSTR pszFolder,
-UINT nIdName,
+LPCTSTR pszName,
LPCTSTR pszCommand,
-UINT nIdTitle,
-BOOL bCheckExistence,
+LPCTSTR pszDescription,
INT iIconNr)
{
TCHAR szPath[MAX_PATH];
TCHAR szExeName[MAX_PATH];
-TCHAR szTitle[256];
-TCHAR szName[256];
-LPTSTR Ptr = szPath;
+LPTSTR Ptr;
TCHAR szWorkingDirBuf[MAX_PATH];
LPTSTR pszWorkingDir = NULL;
LPTSTR lpFilePart;
@@ -152,12 +148,9 @@
_tcscpy(szPath, pszCommand);
}
-if (bCheckExistence)
-{
-if ((_taccess(szPath, 0 )) == -1)
-/* Expected error, don't return FALSE */
-return TRUE;
-}
+if ((_taccess(szPath, 0 )) == -1)
+/* Expected error, don't return FALSE */
+return TRUE;
dwLen = GetFullPathName(szPath,
sizeof(szWorkingDirBuf) /
sizeof(szWorkingDirBuf[0]),
@@ -185,47 +178,104 @@
pszWorkingDir = szWorkingDirBuf;
}
-
-if (!SHGetSpecialFolderPath(0, szPath, csidl, TRUE))
+_tcscpy(szPath, pszFolder);
+
+Ptr = PathAddBackslash(szPath);
+
+_tcscpy(Ptr, pszName);
+
+// FIXME: we should pass 'command' straight in here, but shell32 doesn't
expand it
+return SUCCEEDED(CreateShellLink(szPath, szExeName, _T(""), pszWorkingDir,
szExeName, iIconNr, pszDescription));
+}
+
+
+static BOOL CreateShortcutsFromSection(HINF hinf, LPWSTR pszSection, LPCWSTR
pszFolder)
+{
+INFCONTEXT Context;
+WCHAR szCommand[MAX_PATH];
+WCHAR szName[MAX_PATH];
+WCHAR szDescription[MAX_PATH];
+INT iIconNr;
+
+if (!SetupFindFirstLine(hinf, pszSection, NULL, &Context))
return FALSE;
-if (pszFolder)
-{
-Ptr = PathAddBackslash(Ptr);
-_tcscpy(Ptr, pszFolder);
-}
-
-Ptr = PathAddBackslash(Ptr);
-
-if (!LoadString(hDllInstance, nIdName, szName,
sizeof(szName)/sizeof(szName[0])))
+do
+{
+if (SetupGetFieldCount(&Context) < 4)
+continue;
+
+if (!SetupGetStringFieldW(&Context, 1, szCommand, MAX_PATH, NULL))
+continue;
+
+if (!SetupGetStringFieldW(&Context, 2, szName, MAX_PATH, NULL))
+continue;
+
+if (!SetupGetStringFieldW(&Context, 3, szDescription, MAX_PATH, NULL))
+continue;
+
+if (!SetupGetIntField(&Context, 4, &iIconNr))
+continue;
+
+_tcscat(szName, L".lnk");
+
+CreateShortcut(pszFolder, szName, szCommand, szDescription, iIconNr);
+
+}while (SetupFindNextLine(&Context, &Context));
+
+return TRUE;
+}
+
+static BOOL CreateShortcuts(HINF hinf, LPCWSTR szSection)
+{
+INFCONTEXT Context;
+WCHAR szPath[MAX_PATH];
+WCHAR szFolder[MAX_PATH];
+WCHAR szFolderSection[MAX_PATH];
+INT csidl;
+LPWSTR p;
+
+CoInitialize(NULL);
+
+if (!SetupFindFirstLine(hinf, szSection, NULL, &Context))
return FALSE;
-_tcscpy(Ptr, szName);
-
-if (!LoadString(hDllInstance, nIdTitle, szTitle,
sizeof(szTitle)/sizeof(szTitle[0])))
-return FALSE;
-
-// FIXME: we should pass 'command' straight in here, but shell32 doesn't
expand it
-return SUCCEEDED(CreateShellLink(szPath, szExeName, _T(""), pszWorkingDir,
szExeName, iIconNr, szTitle));
-}
-
-static BOOL
-CreateShortcutFolder(int csidl, UINT nID, LPTSTR pszName, int cchNameLen)
-{
-TCHAR szPath[MAX_PATH];
-LPTSTR p;
-
-if (!SHGetSpecialFolderPath(0, szPath, csidl, TRUE))
-return FALSE;
-
-if (!LoadString(hDllInstance, nID, pszName, cchNameLen))
-return FALSE;
-
-p = PathAddBackslash(szPath);
-_tcscpy(p, pszName);
-
-return CreateDirectory(szPath, NULL) ||
GetLastError()==ERROR_ALREADY_EXISTS;
-}
-
+
+do
+{
+if (SetupGetFieldCount(&Context) < 2)
+continue;
+
+if (!SetupGetStringFieldW(&Context, 0, szFolderSection, MAX_PATH,
NULL))
+continue;
+
+if (!SetupGetIntField(&Context, 1, &csidl))
+continue;
+
+if (!SetupGetStringFieldW(&Context, 2, szFolder, M
[ros-diffs] [ekohl] 59109: [SAMSRV] Implement SamIFree_SAMPR_GET_GROUPS_BUFFER.
Author: ekohl
Date: Wed May 29 20:21:42 2013
New Revision: 59109
URL: http://svn.reactos.org/svn/reactos?rev=59109&view=rev
Log:
[SAMSRV]
Implement SamIFree_SAMPR_GET_GROUPS_BUFFER.
Modified:
trunk/reactos/dll/win32/samsrv/samsrv.c
trunk/reactos/dll/win32/samsrv/samsrv.spec
Modified: trunk/reactos/dll/win32/samsrv/samsrv.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?rev=59109&r1=59108&r2=59109&view=diff
==
--- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Wed May 29
20:21:42 2013
@@ -167,6 +167,20 @@
VOID
NTAPI
+SamIFree_SAMPR_GET_GROUPS_BUFFER(PSAMPR_GET_GROUPS_BUFFER Ptr)
+{
+if (Ptr != NULL)
+{
+if (Ptr->Groups != NULL)
+MIDL_user_free(Ptr->Groups);
+
+MIDL_user_free(Ptr);
+}
+}
+
+
+VOID
+NTAPI
SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr)
{
if (Ptr != NULL)
Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.spec?rev=59109&r1=59108&r2=59109&view=diff
==
--- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Wed May 29
20:21:42 2013
@@ -21,7 +21,7 @@
@ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER
@ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER
@ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr)
-@ stub SamIFree_SAMPR_GET_GROUPS_BUFFER
+@ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr)
@ stub SamIFree_SAMPR_GET_MEMBERS_BUFFER
@ stub SamIFree_SAMPR_GROUP_INFO_BUFFER
@ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr)
[ros-diffs] [gadamopoulos] 59108: - Add shortcuts.inf file that will be used by syssetup to create the shortcuts in second stage. In this way shortcuts and their folders won't be hardcoded in syssetup
Author: gadamopoulos
Date: Wed May 29 19:35:35 2013
New Revision: 59108
URL: http://svn.reactos.org/svn/reactos?rev=59108&view=rev
Log:
- Add shortcuts.inf file that will be used by syssetup to create the shortcuts
in second stage. In this way shortcuts and their folders won't be hardcoded in
syssetup
Added:
trunk/reactos/media/inf/shortcuts.inf
Modified:
trunk/reactos/media/inf/CMakeLists.txt
Modified: trunk/reactos/media/inf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?rev=59108&r1=59107&r2=59108&view=diff
==
--- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Wed May 29
19:35:35 2013
@@ -31,6 +31,7 @@
nettcpip.inf
ports.inf
scsi.inf
+shortcuts.inf
unknown.inf
usb.inf
usbport.inf
Added: trunk/reactos/media/inf/shortcuts.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?rev=59108&view=auto
==
--- trunk/reactos/media/inf/shortcuts.inf (added)
+++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Wed May 29
19:35:35 2013
@@ -0,0 +1,1344 @@
+[Version]
+Signature = $Windows NT$
+ClassGUID = {----}
+
+[ShortcutFolders]
+DesktopShortcuts=0,
+ProgramShortcuts=2,
+AdminToolsShortcuts=47,
+AccessoriesShortcuts=2, %ACCESSORIES%
+SystemToolsShortcuts=2, %SYSTOOLS%
+AccesibilityShortcuts=2, %ACCESIBILITY%
+EntertainmentShortcuts=2, %ENTERTAINMENT%
+GamesShortcuts=2, %GAMES%
+
+[DesktopShortcuts]
+%SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0
+
+[ProgramShortcuts]
+%SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 1
+%SystemRoot%\system32\rapps.exe, %RAPPS_TITLE%, %RAPPS_DESC%, 0
+
+[AdminToolsShortcuts]
+%SystemRoot%\system32\servman.exe, %SERVMAN_TITLE%, %SERVMAN_DESC%, 0
+%SystemRoot%\system32\devmgmt.exe, %DEVMGMT_TITLE%, %DEVMGMT_DESC%, 0
+%SystemRoot%\system32\eventvwr.exe, %EVENTVWR_TITLE%, %EVENTVWR_DESC%, 0
+%SystemRoot%\system32\msconfig.exe, %MSCONFIG_TITLE%, %MSCONFIG_DESC%, 0
+
+[AccessoriesShortcuts]
+%SystemRoot%\system32\calc.exe, %CALC_TITLE%, %CALC_DESC%, 0
+%SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0
+%SystemRoot%\system32\notepad.exe, %NOTEPAD_TITLE%, %NOTEPAD_DESC%, 0
+%SystemRoot%\system32\mstsc.exe, %MSTSC_TITLE%, %MSTSC_DESC%, 0
+%SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0
+%SystemRoot%\system32\wordpad.exe, %WORDPAD_TITLE%, %WORDPAD_DESC%, 0
+%SystemRoot%\system32\mspaint.exe, %MSPAINT_TITLE%, %MSPAINT_DESC%, 0
+
+[SystemToolsShortcuts]
+%SystemRoot%\system32\charmap.exe, %CHARMAP_TITLE%, %CHARMAP_DESC%, 0
+%SystemRoot%\system32\kbswitch.exe, %KBSWITCH_TITLE%, %KBSWITCH_DESC%, 0
+%SystemRoot%\system32\regedit32.exe, %REGEDIT_TITLE%, %REGEDIT_DESC%, 0
+%SystemRoot%\system32\dxdiag.exe, %DXDIAG_TITLE%, %DXDIAG_DESC%, 0
+
+[AccesibilityShortcuts]
+%SystemRoot%\system32\magnify.exe, %MAGNIFY_TITLE%, %MAGNIFY_DESC%, 0
+
+[EntertainmentShortcuts]
+%SystemRoot%\system32\mplay32.exe, %MPLAY_TITLE%, %MPLAY_DESC%, 0
+%SystemRoot%\system32\sndvol32.exe, %SNDVOL_TITLE%, %SNDVOL_DESC%, 0
+%SystemRoot%\system32\sndrec32.exe, %SNDREC32_TITLE%, %SNDREC32_DESC%, 0
+
+[GamesShortcuts]
+%SystemRoot%\system32\sol.exe, %SOL_TITLE%, %SOL_DESC%, 0
+%SystemRoot%\system32\winmine.exe, %WINMINE_TITLE%, %WINMINE_DESC%, 0
+%SystemRoot%\system32\spider.exe, %SPIDER_TITLE%, %SPIDER_DESC%, 0
+
+
+; STRINGS ---
+
+[Strings]
+ACCESSORIES=Accessories
+SYSTOOLS=System Tools
+ACCESIBILITY=Accesibility
+ENTERTAINMENT=Entertainment
+GAMES=Games
+
+CMD_TITLE=Command Prompt
+CMD_DESC=Open command prompt
+EXPLORER_TITLE=ReactOS Explorer
+EXPLORER_DESC=Launch Explorer
+RAPPS_TITLE=ReactOS Applications Manager
+RAPPS_DESC=Download and install various applications
+SERVMAN_TITLE=Service Manager
+SERVMAN_DESC=Launch Service Manager
+DEVMGMT_TITLE=Device Manager
+DEVMGMT_DESC=Launch Device Manager
+EVENTVWR_TITLE=Event Viewer
+EVENTVWR_DESC=Launch Event Viewer
+MSCONFIG_TITLE=System Configuration
+MSCONFIG_DESC=Launch System Configuration program
+CALC_TITLE=Calculator
+CALC_DESC=Launch Calculator
+NOTEPAD_TITLE=Notepad
+NOTEPAD_DESC=Launch Text Editor
+MSTSC_TITLE=Remote Desktop
+MSTSC_DESC=Launch Registry Editor
+SCREENSHOT_TITLE=SnapShot
+SCREENSHOT_DESC=Take screenshot
+WORDPAD_TITLE=WordPad
+WORDPAD_DESC=Launch Document Editor
+MSPAINT_TITLE=MSPaint
+MSPAINT_DESC=Launch Paint
+CHARMAP_TITLE=Character Map
+CHARMAP_DESC=Character Map
+KBSWITCH_TITLE=Keyboard Layout Switcher
+KBSWITCH_DESC=Keyboard Layout Switcher
+REGEDIT_TITLE=Regedit
+REGEDIT_DESC=Launch Registry Editor
+DXDIAG_TITLE=ReactX Diagnostic
+DXDIAG_DESC=Launch ReactX-Diagnostic program
+MAGNIFY_TITLE=Magnify
+MAGNIFY_DESC=Magnify
+MPLAY
[ros-diffs] [ekohl] 59107: [SAMSRV] Set default group membership for new users.
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?rev=59107&r1=59106&r2=59107&view=diff
==
--- 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?rev=59107&r1=59106&r2=59107&view=diff
==
--- 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,
[ros-diffs] [gadamopoulos] 59106: [hivedef.inf] - Fix the names of the colors and sizes of the classic theme. - Fixes CORE-7149
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?rev=59106&r1=59105&r2=59106&view=diff == --- 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",0x0002,"0" ; ReactOS Standard HKCU,"Control Panel\Appearance\New Schemes\0","DisplayName",0x0002,"@themeui.dll,-883" +HKCU,"Control Panel\Appearance\New Schemes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","DisplayName",0x0002,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Flat Menus",0x00010001,0x HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #0",0x0001,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,0x -HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_0%" ; Brick HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x0002,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\1","LegacyName",0x0002,"%DESKTOP_SCHEME_1%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","DisplayName",0x0002,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Flat Menus",0x00010001,0x HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #0",0x0001,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,0x -HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_1%" ; Eggplant HKCU,"Control Panel\Appearance\New Schemes\2","DisplayName",0x0002,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\2","LegacyName",0x0002,"%DESKTOP_SCHEME_2%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","DisplayName",0x0002,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Flat Menus",0x00010001,0x HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Font #0",0x0001,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,0x -HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_2%" ; Green Olive HKCU,"Control Panel\Appearance\New Schemes\3","DisplayName",0x0002,"@themeui.dll,-877" +HKCU,"Control Panel\Appearance\New Schemes\3","LegacyName",0x0002,"%DESKTOP_SCHEME_3%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","DisplayName",0x0002,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","LegacyName",0x0002,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Flat Menus",0x00010001,0x HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Font #0",0x0001,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\Ne
[ros-diffs] [gadamopoulos] 59105: [desk.cpl] - If loading the name of a classic color fails, try to read it from the "LegacyName" value
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=59105&r1=59104&r2=59105&view=diff
==
--- 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);
[ros-diffs] [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
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/CMakeLists.txt?rev=59104&r1=59103&r2=59104&view=diff
==
--- 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/active.c?rev=59104&r1=59103&r2=59104&view=diff
==
--- 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?rev=59104&r1=59103&r2=59104&view=diff
==
--- 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)
+BOO
[ros-diffs] [akhaldi] 59103: [ADVPACK_WINETEST] * Sync with Wine 1.5.26.
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.c?rev=59103&r1=59102&r2=59103&view=diff == --- 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 -#include -#include +#include +#include +#include +#include #include #include -#include "wine/test.h" +#include /* 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?rev=59103&r1=59102&r2=59103&view=diff == --- 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 -#include +#include +#include +#include +#include #include #include -#include "wine/test.h" +#include /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 9 Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install.c?rev=59103&r1=59102&r2=59103&view=diff == --- 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 -#include +#include +#include +#include +#include #include -#include "wine/test.h" +#include static HMODULE hAdvPack; /* function pointers */ Modified: trunk/rostests/winetests/advpack/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/testlist.c?rev=59103&r1=59102&r2=59103&view=diff == --- 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 - #define STANDALONE -#include "wine/test.h" +#include extern void func_advpack(void); extern void func_files(void);
[ros-diffs] [akhaldi] 59102: [ADVPACK] * Sync with Wine 1.5.26.
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?rev=59102&r1=59101&r2=59102&view=diff
==
--- 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=59102&r1=59101&r2=59102&view=diff
==
--- 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
[ros-diffs] [ekohl] 59101: [CMD] Remove cmd_main(). Patch by Lee Schroeder. Thanks! CORE-7205 #resolve #comment Committed in r59101.
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.txt?rev=59101&r1=59100&r2=59101&view=diff
==
--- 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=59101&r1=59100&r2=59101&view=diff
==
--- 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=59101&r1=59100&r2=59101&view=diff
==
--- 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=59100&view=auto
==
--- 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);
-}
