Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[mf] 18508: - move shortcut comment texts into string resources

by mf＠svn.reactos.com

- move shortcut comment texts into string resources - add error handling - create new "Accessories" folder in programs start menu Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/resource.h Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_En.rc _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-10-17 09:44:17 UTC (rev 18507) +++ trunk/reactos/lib/syssetup/install.c 2005-10-17 11:03:30 UTC (rev 18508) @@ -158,17 +158,48 @@ } -static VOID -CreateShortcut(int csidl, LPCTSTR linkName, LPCTSTR command, LPCTSTR title) +static BOOL +CreateShortcut(int csidl, LPCTSTR folder, LPCTSTR linkName, LPCTSTR command, UINT nIdTitle) { TCHAR path[MAX_PATH]; + TCHAR title[256]; + LPTSTR p = path; + + if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) + return FALSE; + + if (folder) + { + p = PathAddBackslash(p); + _tcscpy(p, folder); + } + + p = PathAddBackslash(p); + _tcscpy(p, linkName); + + if (!LoadString(hDllInstance, nIdTitle, title, 256)) + return FALSE; + + return SUCCEEDED(CreateShellLink(path, command, _T(""), NULL, NULL, 0, title)); +} + + +static BOOL +CreateShortcutFolder(int csidl, UINT nID, LPTSTR name, int nameLen) +{ + TCHAR path[MAX_PATH]; LPTSTR p; - SHGetSpecialFolderPath(0, path, csidl, TRUE); + if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) + return FALSE; + + if (!LoadString(hDllInstance, nID, name, nameLen)) + return FALSE; + p = PathAddBackslash(path); - _tcscpy(p, linkName); + _tcscpy(p, name); - CreateShellLink(path, command, _T(""), NULL, NULL, 0, title); + return CreateDirectory(path, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; } @@ -365,6 +396,8 @@ DWORD STDCALL InstallReactOS (HINSTANCE hInstance) { + TCHAR sAccessories[256]; + # if 0 OutputDebugStringA ("InstallReactOS() called\n"); @@ -397,16 +430,20 @@ CoInitialize(NULL); - /* desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt")); + /* create desktop shortcuts */ + CreateShortcut(CSIDL_DESKTOP, NULL, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); - /* program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt")); - CreateShortcut(CSIDL_PROGRAMS, _T("explorer.lnk"), _T("explorer.exe"), _T("Launch Explorer")); - CreateShortcut(CSIDL_PROGRAMS, _T("winefile.lnk"), _T("winefile.exe"), _T("Launch Winefile")); - CreateShortcut(CSIDL_PROGRAMS, _T("notepad.lnk"), _T("notepad.exe"), _T("Launch Text Editor")); - CreateShortcut(CSIDL_PROGRAMS, _T("regedit.lnk"), _T("regedit.exe"), _T("Launch Registry Editor")); + /* create program startmenu shortcuts */ + CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); + CreateShortcut(CSIDL_PROGRAMS, NULL, _T("explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); + CreateShortcut(CSIDL_PROGRAMS, NULL, _T("winefile.lnk"), _T("winefile.exe"), IDS_CMT_WINEFILE); + /* create and fill Accessories subfolder */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) { + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); + } + CoUninitialize(); /* Create the semi-random Domain-SID */ _____ Modified: trunk/reactos/lib/syssetup/resource.h --- trunk/reactos/lib/syssetup/resource.h 2005-10-17 09:44:17 UTC (rev 18507) +++ trunk/reactos/lib/syssetup/resource.h 2005-10-17 11:03:30 UTC (rev 18508) @@ -85,6 +85,14 @@ #define IDS_ACKPROJECTS 3100 +#define IDS_ACCESSORIES 3200 + +#define IDS_CMT_CMD 3210 +#define IDS_CMT_EXPLORER 3211 +#define IDS_CMT_WINEFILE 3212 +#define IDS_CMT_NOTEPAD 3213 +#define IDS_CMT_REGEDIT 3214 + #define IDR_GPL 4000 #endif /* RESOURCE_H */ _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-17 09:44:17 UTC (rev 18507) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-17 11:03:30 UTC (rev 18508) @@ -188,9 +188,19 @@ IDS_LOCALETITLE "Regionale Einstellungen" IDS_LOCALESUBTITLE "Sie k÷nnen ReactOS auf unterschiedliche Regionen und Sprachen einstellen." IDS_DATETIMETITLE "Datum und Uhrzeit" - IDS_DATETIMESUBTITLE "SSetzen Sie das korrekte Datum und Uhrzeit f³r ihren Computer." + IDS_DATETIMESUBTITLE "Setzen Sie das korrekte Datum und Uhrzeit f³r ihren Computer." IDS_PROCESSTITLE "Process page title" IDS_PROCESSSUBTITLE "Process page subtitle" END +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Zubeh÷r" + IDS_CMT_CMD "Íffne Kommandozeilenfenster" + IDS_CMT_EXPLORER "Starte Explorer" + IDS_CMT_WINEFILE "Starte Winefile" + IDS_CMT_NOTEPAD "Starte Texteditor" + IDS_CMT_REGEDIT "Starte Registry Editor" +END + /* EOF */ _____ Modified: trunk/reactos/lib/syssetup/syssetup_En.rc --- trunk/reactos/lib/syssetup/syssetup_En.rc 2005-10-17 09:44:17 UTC (rev 18507) +++ trunk/reactos/lib/syssetup/syssetup_En.rc 2005-10-17 11:03:30 UTC (rev 18508) @@ -194,4 +194,14 @@ IDS_PROCESSSUBTITLE "Process page subtitle" END +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accessories" + IDS_CMT_CMD "Open command prompt" + IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_WINEFILE "Launch Winefile" + IDS_CMT_NOTEPAD "Launch Text Editor" + IDS_CMT_REGEDIT "Launch Registry Editor" +END + /* EOF */

19 years, 2 months

[cwittich] 18507: destroy window handles when program terminates

by cwittich＠svn.reactos.com

destroy window handles when program terminates Modified: trunk/reactos/subsys/system/msconfig/msconfig.c _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-17 08:41:00 UTC (rev 18506) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-17 09:44:17 UTC (rev 18507) @@ -123,6 +123,8 @@ break; case WM_DESTROY: + DestroyWindow(hToolsPage); + DestroyWindow(hServicesPage); return DefWindowProc(hDlg, message, wParam, lParam); }

19 years, 2 months

[hpoussin] 18506: Fix IoGetDeviceProperty, which should never return STATUS_BUFFER_OVERFLOW, but STATUS_BUFFER_TOO_SMALL

by hpoussin＠svn.reactos.com

Fix IoGetDeviceProperty, which should never return STATUS_BUFFER_OVERFLOW, but STATUS_BUFFER_TOO_SMALL Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-16 23:01:01 UTC (rev 18505) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-17 08:41:00 UTC (rev 18506) @@ -325,15 +325,12 @@ if (!NT_SUCCESS(Status)) { ExFreePool(ValueInformation); - return Status; + if (Status == STATUS_BUFFER_OVERFLOW) + return STATUS_BUFFER_TOO_SMALL; + else + return Status; } - if (ValueInformation->DataLength > BufferLength) - { - ExFreePool(ValueInformation); - return STATUS_BUFFER_TOO_SMALL; - } - /* FIXME: Verify the value (NULL-terminated, correct format). */ RtlCopyMemory(PropertyBuffer, ValueInformation->Data,

19 years, 2 months

[cwittich] 18505: set eol-style:native

by cwittich＠svn.reactos.com

set eol-style:native Modified: trunk/reactos/subsys/system/msconfig/De.rc Modified: trunk/reactos/subsys/system/msconfig/En.rc Modified: trunk/reactos/subsys/system/msconfig/msconfig.c Modified: trunk/reactos/subsys/system/msconfig/msconfig.h Modified: trunk/reactos/subsys/system/msconfig/msconfig.rc Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml Modified: trunk/reactos/subsys/system/msconfig/precomp.h Modified: trunk/reactos/subsys/system/msconfig/resource.h Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Modified: trunk/reactos/subsys/system/msconfig/srvpage.h Modified: trunk/reactos/subsys/system/msconfig/toolspage.c Modified: trunk/reactos/subsys/system/msconfig/toolspage.h _____ Modified: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/De.rc 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,71 +1,71 @@ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - -IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 -STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | - WS_THICKFRAME -CAPTION "Systemkonfigurationsprogramm" -FONT 8, "Tahoma" -BEGIN - CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Hilfe", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "?&bernehmen", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" -BEGIN - CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 - EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY - PUSHBUTTON "&Ausf³hren", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" -BEGIN - CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TAB_GENERAL "Allgemein" - IDS_TAB_FREELDR "FREELDR.INI" - IDS_TAB_SERVICES "Dienste" - IDS_TAB_STARTUP "Systemstart" - IDS_TAB_TOOLS "Tools" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_COLUMN_SERVICE "Dienst" - IDS_SERVICES_COLUMN_VENDOR "Hersteller" - IDS_SERVICES_COLUMN_STATUS "Status" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLS_COLUMN_NAME "Name" - IDS_TOOLS_COLUMN_DESCR "Beschreibung" - - IDS_TOOLS_CMD_NAME "Konsole" - IDS_TOOLS_CMD_DESCR "Íffnet die Eingabeaufforderung." - IDS_TOOLS_CMD_CMD "cmd.exe" - IDS_TOOLS_CMD_PARAM "" - - IDS_TOOLS_INFO_NAME "Version" - IDS_TOOLS_INFO_DESCR "Zeigt die installierte ReactOS Version an." - IDS_TOOLS_INFO_CMD "winver.exe" - - IDS_TOOLS_REGEDIT_NAME "Registrierungs-Editor" - IDS_TOOLS_REGEDIT_DESCR "Íffnet den Registrierungs-Editor." - IDS_TOOLS_REGEDIT_CMD "regedit.exe" - - IDS_TOOLS_SYSDM_NAME "Systemeigenschaften" - IDS_TOOLS_SYSDM_DESCR "Zeigt Informationen ³ber diesen Rechner an." - IDS_TOOLS_SYSDM_CMD "control" - IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" -END +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Systemkonfigurationsprogramm" +FONT 8, "Tahoma" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Hilfe", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "?&bernehmen", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Ausf³hren", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_GENERAL "Allgemein" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Dienste" + IDS_TAB_STARTUP "Systemstart" + IDS_TAB_TOOLS "Tools" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Dienst" + IDS_SERVICES_COLUMN_VENDOR "Hersteller" + IDS_SERVICES_COLUMN_STATUS "Status" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Name" + IDS_TOOLS_COLUMN_DESCR "Beschreibung" + + IDS_TOOLS_CMD_NAME "Konsole" + IDS_TOOLS_CMD_DESCR "Íffnet die Eingabeaufforderung." + IDS_TOOLS_CMD_CMD "cmd.exe" + IDS_TOOLS_CMD_PARAM "" + + IDS_TOOLS_INFO_NAME "Version" + IDS_TOOLS_INFO_DESCR "Zeigt die installierte ReactOS Version an." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Registrierungs-Editor" + IDS_TOOLS_REGEDIT_DESCR "Íffnet den Registrierungs-Editor." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Systemeigenschaften" + IDS_TOOLS_SYSDM_DESCR "Zeigt Informationen ³ber diesen Rechner an." + IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" +END Property changes on: trunk/reactos/subsys/system/msconfig/De.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/En.rc 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,70 +1,70 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 -STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | - WS_THICKFRAME -CAPTION "Systemkonfigurationsprogramm" -FONT 8, "Tahoma" -BEGIN - CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Help", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Apply", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" -BEGIN - CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 - EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY - PUSHBUTTON "&Run", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" -BEGIN - CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TAB_GENERAL "General" - IDS_TAB_FREELDR "FREELDR.INI" - IDS_TAB_SERVICES "Services" - IDS_TAB_STARTUP "Startup" - IDS_TAB_TOOLS "Tools" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_COLUMN_SERVICE "Service" - IDS_SERVICES_COLUMN_VENDOR "Vendor" - IDS_SERVICES_COLUMN_STATUS "Status" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLS_COLUMN_NAME "Name" - IDS_TOOLS_COLUMN_DESCR "Description" - - IDS_TOOLS_CMD_NAME "Console" - IDS_TOOLS_CMD_DESCR "" - IDS_TOOLS_CMD_CMD "cmd.exe" - - IDS_TOOLS_INFO_NAME "Version" - IDS_TOOLS_INFO_DESCR "Displays version information." - IDS_TOOLS_INFO_CMD "winver.exe" - - IDS_TOOLS_REGEDIT_NAME "Registry-Editor" - IDS_TOOLS_REGEDIT_DESCR "Opens the Registry-Editor." - IDS_TOOLS_REGEDIT_CMD "regedit.exe" - - IDS_TOOLS_SYSDM_NAME "Systemproperties" - IDS_TOOLS_SYSDM_DESCR "Shows information about this computer." - IDS_TOOLS_SYSDM_CMD "control" - IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" -END +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Systemkonfigurationsprogramm" +FONT 8, "Tahoma" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Help", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Apply", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Run", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_GENERAL "General" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Services" + IDS_TAB_STARTUP "Startup" + IDS_TAB_TOOLS "Tools" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Service" + IDS_SERVICES_COLUMN_VENDOR "Vendor" + IDS_SERVICES_COLUMN_STATUS "Status" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Name" + IDS_TOOLS_COLUMN_DESCR "Description" + + IDS_TOOLS_CMD_NAME "Console" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Version" + IDS_TOOLS_INFO_DESCR "Displays version information." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Registry-Editor" + IDS_TOOLS_REGEDIT_DESCR "Opens the Registry-Editor." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Systemproperties" + IDS_TOOLS_SYSDM_DESCR "Shows information about this computer." + IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" +END Property changes on: trunk/reactos/subsys/system/msconfig/En.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,152 +1,152 @@ -#include <precomp.h> - -HINSTANCE hInst = 0; - -HWND hMainWnd; /* Main Window */ -HWND hTabWnd; /* Tab Control Window */ - - -BOOL OnCreate(HWND hWnd) -{ - TCHAR szTemp[256]; - TCITEM item; - - hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); - - // Insert Tab Pages - LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 0, &item); - - LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 1, &item); - - LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 2, &item); - - LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 3, &item); - - LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 4, &item); - - return TRUE; -} - - -void MsConfig_OnTabWndSelChange(void) -{ - switch (TabCtrl_GetCurSel(hTabWnd)) { - case 0: - ShowWindow(hToolsPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_SHOW); - ShowWindow(hServicesPage, SW_HIDE); - //BringWindowToTop(hFreeLdrPage); - break; - case 1: - ShowWindow(hToolsPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_SHOW); - ShowWindow(hServicesPage, SW_HIDE); - //BringWindowToTop(hFreeLdrPage); - break; - case 2: - ShowWindow(hToolsPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_SHOW); - //BringWindowToTop(hFreeLdrPage); - break; - case 3: - ShowWindow(hToolsPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - //BringWindowToTop(hFreeLdrPage); - break; - case 4: - ShowWindow(hToolsPage, SW_SHOW); - //ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - BringWindowToTop(hToolsPage); - break; - } -} - - -/* Message handler for dialog box. */ -INT_PTR CALLBACK -MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - int idctrl; - LPNMHDR pnmh; - - switch (message) { - case WM_INITDIALOG: - hMainWnd = hDlg; - return OnCreate(hDlg); - - case WM_COMMAND: - - if (LOWORD(wParam) == IDOK) { - //MsConfig_OnSaveChanges(); - } - - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - - case WM_NOTIFY: - idctrl = (int)wParam; - pnmh = (LPNMHDR)lParam; - if ((pnmh->hwndFrom == hTabWnd) && - (pnmh->idFrom == IDC_TAB) && - (pnmh->code == TCN_SELCHANGE)) - { - MsConfig_OnTabWndSelChange(); - } - break; - - case WM_DESTROY: - return DefWindowProc(hDlg, message, wParam, lParam); - - } - - return 0; -} - -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - - INITCOMMONCONTROLSEX InitControls; - - InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); - InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; - InitCommonControlsEx(&InitControls); - - hInst = hInstance; - - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); - - return 0; -} - -/* EOF */ +#include <precomp.h> + +HINSTANCE hInst = 0; + +HWND hMainWnd; /* Main Window */ +HWND hTabWnd; /* Tab Control Window */ + + +BOOL OnCreate(HWND hWnd) +{ + TCHAR szTemp[256]; + TCITEM item; + + hTabWnd = GetDlgItem(hWnd, IDC_TAB); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); + + // Insert Tab Pages + LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 0, &item); + + LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 1, &item); + + LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 2, &item); + + LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 3, &item); + + LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 4, &item); + + return TRUE; +} + + +void MsConfig_OnTabWndSelChange(void) +{ + switch (TabCtrl_GetCurSel(hTabWnd)) { + case 0: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hServicesPage, SW_HIDE); + //BringWindowToTop(hFreeLdrPage); + break; + case 1: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hServicesPage, SW_HIDE); + //BringWindowToTop(hFreeLdrPage); + break; + case 2: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_SHOW); + //BringWindowToTop(hFreeLdrPage); + break; + case 3: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + //BringWindowToTop(hFreeLdrPage); + break; + case 4: + ShowWindow(hToolsPage, SW_SHOW); + //ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + BringWindowToTop(hToolsPage); + break; + } +} + + +/* Message handler for dialog box. */ +INT_PTR CALLBACK +MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + int idctrl; + LPNMHDR pnmh; + + switch (message) { + case WM_INITDIALOG: + hMainWnd = hDlg; + return OnCreate(hDlg); + + case WM_COMMAND: + + if (LOWORD(wParam) == IDOK) { + //MsConfig_OnSaveChanges(); + } + + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; + + case WM_NOTIFY: + idctrl = (int)wParam; + pnmh = (LPNMHDR)lParam; + if ((pnmh->hwndFrom == hTabWnd) && + (pnmh->idFrom == IDC_TAB) && + (pnmh->code == TCN_SELCHANGE)) + { + MsConfig_OnTabWndSelChange(); + } + break; + + case WM_DESTROY: + return DefWindowProc(hDlg, message, wParam, lParam); + + } + + return 0; +} + +int APIENTRY WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + + INITCOMMONCONTROLSEX InitControls; + + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; + InitCommonControlsEx(&InitControls); + + hInst = hInstance; + + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); + + return 0; +} + +/* EOF */ Property changes on: trunk/reactos/subsys/system/msconfig/msconfig.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.h --- trunk/reactos/subsys/system/msconfig/msconfig.h 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/msconfig.h 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,2 +1,2 @@ -extern HINSTANCE hInst; - +extern HINSTANCE hInst; + Property changes on: trunk/reactos/subsys/system/msconfig/msconfig.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.rc --- trunk/reactos/subsys/system/msconfig/msconfig.rc 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/msconfig.rc 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,18 +1,18 @@ -#include <windows.h> -#include <commctrl.h> - -#include "resource.h" - - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Systemconfiguration Tool\0" -#define REACTOS_STR_INTERNAL_NAME "msconfig\0" -#define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe\0" -#include <reactos/version.rc> - - -#include "De.rc" -#include "En.rc" - +#include <windows.h> +#include <commctrl.h> + +#include "resource.h" + + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Systemconfiguration Tool\0" +#define REACTOS_STR_INTERNAL_NAME "msconfig\0" +#define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe\0" +#include <reactos/version.rc> + + +#include "De.rc" +#include "En.rc" + Property changes on: trunk/reactos/subsys/system/msconfig/msconfig.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,16 +1,16 @@ -<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> - <include base="msconfig">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>comctl32</library> - <file>toolspage.c</file> - <file>srvpage.c</file> - <file>msconfig.c</file> - <file>msconfig.rc</file> -</module> +<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> + <include base="msconfig">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>toolspage.c</file> + <file>srvpage.c</file> + <file>msconfig.c</file> + <file>msconfig.rc</file> +</module> Property changes on: trunk/reactos/subsys/system/msconfig/msconfig.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/precomp.h --- trunk/reactos/subsys/system/msconfig/precomp.h 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/precomp.h 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,11 +1,11 @@ -#include <windows.h> -#define NTOS_MODE_USER -#include <commctrl.h> -#include <winuser.h> -#include <tchar.h> - -#include "resource.h" -#include "msconfig.h" -#include "toolspage.h" -#include "srvpage.h" - +#include <windows.h> +#define NTOS_MODE_USER +#include <commctrl.h> +#include <winuser.h> +#include <tchar.h> + +#include "resource.h" +#include "msconfig.h" +#include "toolspage.h" +#include "srvpage.h" + Property changes on: trunk/reactos/subsys/system/msconfig/precomp.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/resource.h 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,47 +1,47 @@ -#define IDD_MSCONFIG_DIALOG 101 -#define IDD_TOOLS_PAGE 102 -#define IDD_SERVICES_PAGE 103 -#define IDD_GENERAL_PAGE 104 -#define IDD_STARTUP_PAGE 105 - -#define IDC_TAB 1001 -#define IDC_BTN_APPLY 1002 -#define IDC_BTN_HELP 1003 -#define IDC_TOOLS_CMDLINE 1004 -#define IDC_BTN_RUN 1005 -#define IDC_SERVICES_LIST 1006 -#define IDC_TOOLS_LIST 1007 - -#define IDS_TAB_TOOLS 2001 -#define IDS_TAB_FREELDR 2002 -#define IDS_TAB_STARTUP 2003 -#define IDS_TAB_SERVICES 2004 -#define IDS_TAB_GENERAL 2005 - -#define IDS_TOOLS_COLUMN_NAME 2010 -#define IDS_TOOLS_COLUMN_DESCR 2011 -#define IDS_SERVICES_COLUMN_SERVICE 2012 -#define IDS_SERVICES_COLUMN_VENDOR 2013 -#define IDS_SERVICES_COLUMN_STATUS 2014 - -#define IDS_TOOLS_CMD_NAME 2100 -#define IDS_TOOLS_CMD_DESCR 2101 -#define IDS_TOOLS_CMD_CMD 2102 -#define IDS_TOOLS_CMD_PARAM 2103 - -#define IDS_TOOLS_INFO_NAME 2104 -#define IDS_TOOLS_INFO_DESCR 2105 -#define IDS_TOOLS_INFO_CMD 2106 -#define IDS_TOOLS_INFO_PARAM 2107 - -#define IDS_TOOLS_REGEDIT_NAME 2108 -#define IDS_TOOLS_REGEDIT_DESCR 2109 -#define IDS_TOOLS_REGEDIT_CMD 2110 -#define IDS_TOOLS_REGEDIT_PARAM 2111 - -#define IDS_TOOLS_SYSDM_NAME 2112 -#define IDS_TOOLS_SYSDM_DESCR 2113 -#define IDS_TOOLS_SYSDM_CMD 2114 -#define IDS_TOOLS_SYSDM_PARAM 2115 - -/* EOF */ +#define IDD_MSCONFIG_DIALOG 101 +#define IDD_TOOLS_PAGE 102 +#define IDD_SERVICES_PAGE 103 +#define IDD_GENERAL_PAGE 104 +#define IDD_STARTUP_PAGE 105 + +#define IDC_TAB 1001 +#define IDC_BTN_APPLY 1002 +#define IDC_BTN_HELP 1003 +#define IDC_TOOLS_CMDLINE 1004 +#define IDC_BTN_RUN 1005 +#define IDC_SERVICES_LIST 1006 +#define IDC_TOOLS_LIST 1007 + +#define IDS_TAB_TOOLS 2001 +#define IDS_TAB_FREELDR 2002 +#define IDS_TAB_STARTUP 2003 +#define IDS_TAB_SERVICES 2004 +#define IDS_TAB_GENERAL 2005 + +#define IDS_TOOLS_COLUMN_NAME 2010 +#define IDS_TOOLS_COLUMN_DESCR 2011 +#define IDS_SERVICES_COLUMN_SERVICE 2012 +#define IDS_SERVICES_COLUMN_VENDOR 2013 +#define IDS_SERVICES_COLUMN_STATUS 2014 + +#define IDS_TOOLS_CMD_NAME 2100 +#define IDS_TOOLS_CMD_DESCR 2101 +#define IDS_TOOLS_CMD_CMD 2102 +#define IDS_TOOLS_CMD_PARAM 2103 + +#define IDS_TOOLS_INFO_NAME 2104 +#define IDS_TOOLS_INFO_DESCR 2105 +#define IDS_TOOLS_INFO_CMD 2106 +#define IDS_TOOLS_INFO_PARAM 2107 + +#define IDS_TOOLS_REGEDIT_NAME 2108 +#define IDS_TOOLS_REGEDIT_DESCR 2109 +#define IDS_TOOLS_REGEDIT_CMD 2110 +#define IDS_TOOLS_REGEDIT_PARAM 2111 + +#define IDS_TOOLS_SYSDM_NAME 2112 +#define IDS_TOOLS_SYSDM_DESCR 2113 +#define IDS_TOOLS_SYSDM_CMD 2114 +#define IDS_TOOLS_SYSDM_PARAM 2115 + +/* EOF */ Property changes on: trunk/reactos/subsys/system/msconfig/resource.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,50 +1,50 @@ -#include <precomp.h> - -HWND hServicesPage; -HWND hServicesListCtrl; -HWND hServicesDialog; - -INT_PTR CALLBACK -ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - LV_COLUMN column; - TCHAR szTemp[256]; - - switch (message) { - case WM_INITDIALOG: - - hServicesListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); - hServicesDialog = hDlg; - - DWORD dwStyle; - dwStyle = SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); - dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; - SendMessage(hServicesListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); - - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - - // Initialize the application page's controls - column.mask = LVCF_TEXT | LVCF_WIDTH; - - LoadString(hInst, IDS_SERVICES_COLUMN_SERVICE, szTemp, 256); - column.pszText = szTemp; - column.cx = 150; - ListView_InsertColumn(hServicesListCtrl, 0, &column); - - column.mask = LVCF_TEXT | LVCF_WIDTH; - LoadString(hInst, IDS_SERVICES_COLUMN_VENDOR, szTemp, 256); - column.pszText = szTemp; - column.cx = 200; - ListView_InsertColumn(hServicesListCtrl, 1, &column); - - column.mask = LVCF_TEXT | LVCF_WIDTH; - LoadString(hInst, IDS_SERVICES_COLUMN_STATUS, szTemp, 256); - column.pszText = szTemp; - column.cx = 70; - ListView_InsertColumn(hServicesListCtrl, 1, &column); - - return TRUE; - } - - return 0; -} +#include <precomp.h> + +HWND hServicesPage; +HWND hServicesListCtrl; +HWND hServicesDialog; + +INT_PTR CALLBACK +ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + LV_COLUMN column; + TCHAR szTemp[256]; + + switch (message) { + case WM_INITDIALOG: + + hServicesListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); + hServicesDialog = hDlg; + + DWORD dwStyle; + dwStyle = SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; + SendMessage(hServicesListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + + // Initialize the application page's controls + column.mask = LVCF_TEXT | LVCF_WIDTH; + + LoadString(hInst, IDS_SERVICES_COLUMN_SERVICE, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + ListView_InsertColumn(hServicesListCtrl, 0, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_SERVICES_COLUMN_VENDOR, szTemp, 256); + column.pszText = szTemp; + column.cx = 200; + ListView_InsertColumn(hServicesListCtrl, 1, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_SERVICES_COLUMN_STATUS, szTemp, 256); + column.pszText = szTemp; + column.cx = 70; + ListView_InsertColumn(hServicesListCtrl, 1, &column); + + return TRUE; + } + + return 0; +} Property changes on: trunk/reactos/subsys/system/msconfig/srvpage.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.h --- trunk/reactos/subsys/system/msconfig/srvpage.h 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/srvpage.h 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,4 +1,4 @@ -extern HWND hServicesPage; -extern HWND hServicesListCtrl; - -INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +extern HWND hServicesPage; +extern HWND hServicesListCtrl; + +INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Property changes on: trunk/reactos/subsys/system/msconfig/srvpage.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/toolspage.c --- trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-16 22:59:45 UTC (rev 18504) +++ trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-16 23:01:01 UTC (rev 18505) @@ -1,124 +1,124 @@ -#include <precomp.h> - -HWND hToolsPage; -HWND hToolsListCtrl; -HWND hToolsDialog; - -void AddItem ( DWORD, DWORD, DWORD, DWORD ); -void FillListView ( void ); - -DWORD ListItems_Cmds[20]; -DWORD ListItems_Params[20]; - -void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id ) { - TCHAR szTemp[256]; - LV_ITEM item; - - LoadString(hInst, name_id, szTemp, 256); - memset(&item, 0, sizeof(LV_ITEM)); - item.mask = LVIF_TEXT; - item.iImage = 0; - item.pszText = szTemp; - item.iItem = ListView_GetItemCount(hToolsListCtrl); - item.lParam = 0; [truncated at 1000 lines; 248 more skipped]

19 years, 2 months

[cwittich] 18504: started implementation of msconfig tool

by cwittich＠svn.reactos.com

started implementation of msconfig tool Modified: trunk/reactos/subsys/system/directory.xml Added: trunk/reactos/subsys/system/msconfig/ Added: trunk/reactos/subsys/system/msconfig/De.rc Added: trunk/reactos/subsys/system/msconfig/En.rc Added: trunk/reactos/subsys/system/msconfig/msconfig.c Added: trunk/reactos/subsys/system/msconfig/msconfig.h Added: trunk/reactos/subsys/system/msconfig/msconfig.rc Added: trunk/reactos/subsys/system/msconfig/msconfig.xml Added: trunk/reactos/subsys/system/msconfig/precomp.h Added: trunk/reactos/subsys/system/msconfig/resource.h Added: trunk/reactos/subsys/system/msconfig/srvpage.c Added: trunk/reactos/subsys/system/msconfig/srvpage.h Added: trunk/reactos/subsys/system/msconfig/toolspage.c Added: trunk/reactos/subsys/system/msconfig/toolspage.h _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/directory.xml 2005-10-16 22:59:45 UTC (rev 18504) @@ -32,6 +32,9 @@ <directory name="lsass"> <xi:include href="lsass/lsass.xml" /> </directory> +<directory name="msconfig"> + <xi:include href="msconfig/msconfig.xml" /> +</directory> <directory name="msiexec"> <xi:include href="msiexec/msiexec.xml" /> </directory> _____ Added: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/De.rc 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,71 @@ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Systemkonfigurationsprogramm" +FONT 8, "Tahoma" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Hilfe", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "?&bernehmen", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Ausf³hren", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_GENERAL "Allgemein" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Dienste" + IDS_TAB_STARTUP "Systemstart" + IDS_TAB_TOOLS "Tools" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Dienst" + IDS_SERVICES_COLUMN_VENDOR "Hersteller" + IDS_SERVICES_COLUMN_STATUS "Status" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Name" + IDS_TOOLS_COLUMN_DESCR "Beschreibung" + + IDS_TOOLS_CMD_NAME "Konsole" + IDS_TOOLS_CMD_DESCR "Íffnet die Eingabeaufforderung." + IDS_TOOLS_CMD_CMD "cmd.exe" + IDS_TOOLS_CMD_PARAM "" + + IDS_TOOLS_INFO_NAME "Version" + IDS_TOOLS_INFO_DESCR "Zeigt die installierte ReactOS Version an." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Registrierungs-Editor" + IDS_TOOLS_REGEDIT_DESCR "Íffnet den Registrierungs-Editor." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Systemeigenschaften" + IDS_TOOLS_SYSDM_DESCR "Zeigt Informationen ³ber diesen Rechner an." + IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" +END _____ Added: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/En.rc 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,70 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Systemkonfigurationsprogramm" +FONT 8, "Tahoma" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Help", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Apply", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Run", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_GENERAL "General" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Services" + IDS_TAB_STARTUP "Startup" + IDS_TAB_TOOLS "Tools" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Service" + IDS_SERVICES_COLUMN_VENDOR "Vendor" + IDS_SERVICES_COLUMN_STATUS "Status" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Name" + IDS_TOOLS_COLUMN_DESCR "Description" + + IDS_TOOLS_CMD_NAME "Console" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Version" + IDS_TOOLS_INFO_DESCR "Displays version information." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Registry-Editor" + IDS_TOOLS_REGEDIT_DESCR "Opens the Registry-Editor." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Systemproperties" + IDS_TOOLS_SYSDM_DESCR "Shows information about this computer." + IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" +END _____ Added: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,152 @@ +#include <precomp.h> + +HINSTANCE hInst = 0; + +HWND hMainWnd; /* Main Window */ +HWND hTabWnd; /* Tab Control Window */ + + +BOOL OnCreate(HWND hWnd) +{ + TCHAR szTemp[256]; + TCITEM item; + + hTabWnd = GetDlgItem(hWnd, IDC_TAB); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); + + // Insert Tab Pages + LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 0, &item); + + LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 1, &item); + + LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 2, &item); + + LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 3, &item); + + LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 4, &item); + + return TRUE; +} + + +void MsConfig_OnTabWndSelChange(void) +{ + switch (TabCtrl_GetCurSel(hTabWnd)) { + case 0: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hServicesPage, SW_HIDE); + //BringWindowToTop(hFreeLdrPage); + break; + case 1: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hServicesPage, SW_HIDE); + //BringWindowToTop(hFreeLdrPage); + break; + case 2: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_SHOW); + //BringWindowToTop(hFreeLdrPage); + break; + case 3: + ShowWindow(hToolsPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + //BringWindowToTop(hFreeLdrPage); + break; + case 4: + ShowWindow(hToolsPage, SW_SHOW); + //ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + BringWindowToTop(hToolsPage); + break; + } +} + + +/* Message handler for dialog box. */ +INT_PTR CALLBACK +MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + int idctrl; + LPNMHDR pnmh; + + switch (message) { + case WM_INITDIALOG: + hMainWnd = hDlg; + return OnCreate(hDlg); + + case WM_COMMAND: + + if (LOWORD(wParam) == IDOK) { + //MsConfig_OnSaveChanges(); + } + + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; + + case WM_NOTIFY: + idctrl = (int)wParam; + pnmh = (LPNMHDR)lParam; + if ((pnmh->hwndFrom == hTabWnd) && + (pnmh->idFrom == IDC_TAB) && + (pnmh->code == TCN_SELCHANGE)) + { + MsConfig_OnTabWndSelChange(); + } + break; + + case WM_DESTROY: + return DefWindowProc(hDlg, message, wParam, lParam); + + } + + return 0; +} + +int APIENTRY WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + + INITCOMMONCONTROLSEX InitControls; + + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; + InitCommonControlsEx(&InitControls); + + hInst = hInstance; + + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); + + return 0; +} + +/* EOF */ _____ Added: trunk/reactos/subsys/system/msconfig/msconfig.h --- trunk/reactos/subsys/system/msconfig/msconfig.h 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/msconfig.h 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,2 @@ +extern HINSTANCE hInst; + _____ Added: trunk/reactos/subsys/system/msconfig/msconfig.rc --- trunk/reactos/subsys/system/msconfig/msconfig.rc 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/msconfig.rc 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,18 @@ +#include <windows.h> +#include <commctrl.h> + +#include "resource.h" + + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Systemconfiguration Tool\0" +#define REACTOS_STR_INTERNAL_NAME "msconfig\0" +#define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe\0" +#include <reactos/version.rc> + + +#include "De.rc" +#include "En.rc" + _____ Added: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,16 @@ +<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> + <include base="msconfig">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>toolspage.c</file> + <file>srvpage.c</file> + <file>msconfig.c</file> + <file>msconfig.rc</file> +</module> _____ Added: trunk/reactos/subsys/system/msconfig/precomp.h --- trunk/reactos/subsys/system/msconfig/precomp.h 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/precomp.h 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,11 @@ +#include <windows.h> +#define NTOS_MODE_USER +#include <commctrl.h> +#include <winuser.h> +#include <tchar.h> + +#include "resource.h" +#include "msconfig.h" +#include "toolspage.h" +#include "srvpage.h" + _____ Added: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/resource.h 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,47 @@ +#define IDD_MSCONFIG_DIALOG 101 +#define IDD_TOOLS_PAGE 102 +#define IDD_SERVICES_PAGE 103 +#define IDD_GENERAL_PAGE 104 +#define IDD_STARTUP_PAGE 105 + +#define IDC_TAB 1001 +#define IDC_BTN_APPLY 1002 +#define IDC_BTN_HELP 1003 +#define IDC_TOOLS_CMDLINE 1004 +#define IDC_BTN_RUN 1005 +#define IDC_SERVICES_LIST 1006 +#define IDC_TOOLS_LIST 1007 + +#define IDS_TAB_TOOLS 2001 +#define IDS_TAB_FREELDR 2002 +#define IDS_TAB_STARTUP 2003 +#define IDS_TAB_SERVICES 2004 +#define IDS_TAB_GENERAL 2005 + +#define IDS_TOOLS_COLUMN_NAME 2010 +#define IDS_TOOLS_COLUMN_DESCR 2011 +#define IDS_SERVICES_COLUMN_SERVICE 2012 +#define IDS_SERVICES_COLUMN_VENDOR 2013 +#define IDS_SERVICES_COLUMN_STATUS 2014 + +#define IDS_TOOLS_CMD_NAME 2100 +#define IDS_TOOLS_CMD_DESCR 2101 +#define IDS_TOOLS_CMD_CMD 2102 +#define IDS_TOOLS_CMD_PARAM 2103 + +#define IDS_TOOLS_INFO_NAME 2104 +#define IDS_TOOLS_INFO_DESCR 2105 +#define IDS_TOOLS_INFO_CMD 2106 +#define IDS_TOOLS_INFO_PARAM 2107 + +#define IDS_TOOLS_REGEDIT_NAME 2108 +#define IDS_TOOLS_REGEDIT_DESCR 2109 +#define IDS_TOOLS_REGEDIT_CMD 2110 +#define IDS_TOOLS_REGEDIT_PARAM 2111 + +#define IDS_TOOLS_SYSDM_NAME 2112 +#define IDS_TOOLS_SYSDM_DESCR 2113 +#define IDS_TOOLS_SYSDM_CMD 2114 +#define IDS_TOOLS_SYSDM_PARAM 2115 + +/* EOF */ _____ Added: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,50 @@ +#include <precomp.h> + +HWND hServicesPage; +HWND hServicesListCtrl; +HWND hServicesDialog; + +INT_PTR CALLBACK +ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + LV_COLUMN column; + TCHAR szTemp[256]; + + switch (message) { + case WM_INITDIALOG: + + hServicesListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); + hServicesDialog = hDlg; + + DWORD dwStyle; + dwStyle = SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; + SendMessage(hServicesListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + + // Initialize the application page's controls + column.mask = LVCF_TEXT | LVCF_WIDTH; + + LoadString(hInst, IDS_SERVICES_COLUMN_SERVICE, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + ListView_InsertColumn(hServicesListCtrl, 0, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_SERVICES_COLUMN_VENDOR, szTemp, 256); + column.pszText = szTemp; + column.cx = 200; + ListView_InsertColumn(hServicesListCtrl, 1, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_SERVICES_COLUMN_STATUS, szTemp, 256); + column.pszText = szTemp; + column.cx = 70; + ListView_InsertColumn(hServicesListCtrl, 1, &column); + + return TRUE; + } + + return 0; +} _____ Added: trunk/reactos/subsys/system/msconfig/srvpage.h --- trunk/reactos/subsys/system/msconfig/srvpage.h 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/srvpage.h 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,4 @@ +extern HWND hServicesPage; +extern HWND hServicesListCtrl; + +INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); _____ Added: trunk/reactos/subsys/system/msconfig/toolspage.c --- trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,124 @@ +#include <precomp.h> + +HWND hToolsPage; +HWND hToolsListCtrl; +HWND hToolsDialog; + +void AddItem ( DWORD, DWORD, DWORD, DWORD ); +void FillListView ( void ); + +DWORD ListItems_Cmds[20]; +DWORD ListItems_Params[20]; + +void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id ) { + TCHAR szTemp[256]; + LV_ITEM item; + + LoadString(hInst, name_id, szTemp, 256); + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT; + item.iImage = 0; + item.pszText = szTemp; + item.iItem = ListView_GetItemCount(hToolsListCtrl); + item.lParam = 0; + ListView_InsertItem(hToolsListCtrl, &item); + + ListItems_Cmds[item.iItem] = cmd_id; + ListItems_Params[item.iItem] = param_id; + + LoadString(hInst, descr_id, szTemp, 256); + item.pszText = szTemp; + item.iSubItem = 1; + SendMessage(hToolsListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); +} + +void FillListView ( void ) { + AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM); + AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM); + AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM); + AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM); +} + +INT_PTR CALLBACK +ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + LV_COLUMN column; + TCHAR szTemp[256]; + TCHAR szTemp2[256]; + LPNMITEMACTIVATE lpnmitem; + LPNMHDR nmh; + + switch (message) { + case WM_INITDIALOG: + + hToolsListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); + hToolsDialog = hDlg; + + DWORD dwStyle; + dwStyle = SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT; + SendMessage(hToolsListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + + // Initialize the application page's controls + column.mask = LVCF_TEXT | LVCF_WIDTH; + + LoadString(hInst, IDS_TOOLS_COLUMN_NAME, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + ListView_InsertColumn(hToolsListCtrl, 0, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_TOOLS_COLUMN_DESCR, szTemp, 256); + column.pszText = szTemp; + column.cx = 500; + ListView_InsertColumn(hToolsListCtrl, 1, &column); + + FillListView(); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_BTN_RUN: + if (ListView_GetSelectionMark(hToolsListCtrl) != -1) { + LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], szTemp, 256); + LoadString(hInst, ListItems_Params[ListView_GetSelectionMark(hToolsListCtrl)], szTemp2, 256); + ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + } + } + break; + + case WM_NOTIFY: + nmh = (LPNMHDR) lParam; + if (nmh->hwndFrom == hToolsListCtrl) + { + switch (nmh->code) + { + case NM_CLICK: + lpnmitem = (LPNMITEMACTIVATE) lParam; + if (lpnmitem->iItem > -1) { + LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); + _tcscat(szTemp, _T(" ")); + _tcscat(szTemp, szTemp2); + SendDlgItemMessage(hToolsDialog, IDC_TOOLS_CMDLINE, WM_SETTEXT, 0, (LPARAM) szTemp); + } + break; + case NM_DBLCLK: + lpnmitem = (LPNMITEMACTIVATE) lParam; + if (lpnmitem->iItem > -1) { + LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); + ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + } + break; + } + } + break; + } + + return 0; +} + _____ Added: trunk/reactos/subsys/system/msconfig/toolspage.h --- trunk/reactos/subsys/system/msconfig/toolspage.h 2005-10-16 18:29:08 UTC (rev 18503) +++ trunk/reactos/subsys/system/msconfig/toolspage.h 2005-10-16 22:59:45 UTC (rev 18504) @@ -0,0 +1,5 @@ +extern HWND hToolsPage; +extern HWND hToolsListCtrl; + +INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +

19 years, 2 months

[greatlrd] 18503: forget add Ja.rc to rundll32.rc

by greatlrd＠svn.reactos.com

forget add Ja.rc to rundll32.rc Modified: trunk/reactos/subsys/system/rundll32/rundll32.rc _____ Modified: trunk/reactos/subsys/system/rundll32/rundll32.rc --- trunk/reactos/subsys/system/rundll32/rundll32.rc 2005-10-16 18:21:20 UTC (rev 18502) +++ trunk/reactos/subsys/system/rundll32/rundll32.rc 2005-10-16 18:29:08 UTC (rev 18503) @@ -8,4 +8,4 @@ #include "En.rc" #include "De.rc" - +#include "Ja.rc"

19 years, 2 months

[greatlrd] 18502: Update directx header and correct more info.

by greatlrd＠svn.reactos.com

Update directx header and correct more info. I belive the ddraw.h header are okay now Modified: trunk/reactos/w32api/include/ddk/ddrawi.h Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawi.h --- trunk/reactos/w32api/include/ddk/ddrawi.h 2005-10-16 17:11:48 UTC (rev 18501) +++ trunk/reactos/w32api/include/ddk/ddrawi.h 2005-10-16 18:21:20 UTC (rev 18502) @@ -26,6 +26,8 @@ extern "C" { #endif +#define OBJECT_ISROOT 0x80000000 + #include <ddraw.h> #include <dvp.h> #include <ddkernel.h> @@ -33,6 +35,9 @@ #define DDAPI WINAPI +#define VALID_ALIGNMENT(align) \ + (!((align==0)||(align%2)!= 0 )) + /* the DirectDraw versions */ #define DD_VERSION 0x0200 /* compatibility version */ #define DD_RUNTIME_VERSION 0x0902 /* actual version */ @@ -41,17 +46,67 @@ #define DD_HAL_VERSION 0x0100 /* more DCICOMMAND escapes */ +#ifndef DCICOMMAND +#define DCICOMMAND 3075 +#endif + #define DDCREATEDRIVEROBJECT 10 #define DDGET32BITDRIVERNAME 11 #define DDNEWCALLBACKFNS 12 #define DDVERSIONINFO 13 + + +#define DDUNSUPPORTEDMODE ((DWORD) -1) + +#include "dciddi.h" + #ifndef CCHDEVICENAME #define CCHDEVICENAME 32 #endif #define MAX_DRIVER_NAME CCHDEVICENAME +#define DDHAL_DRIVER_DLLNAME "DDRAW16.DLL" +#define DDHAL_APP_DLLNAME "DDRAW.DLL" + + +/* GUID */ +#ifdef _WIN32 +DEFINE_GUID(GUID_MiscellaneousCallbacks, 0xefd60cc0, 0x49e7, 0x11d0, 0x88, 0x9d, 0x00, 0xaa, 0x00, 0xbb, 0xb7, 0x6a); +DEFINE_GUID(GUID_VideoPortCallbacks, 0xefd60cc1, 0x49e7, 0x11d0, 0x88, 0x9d, 0x00, 0xaa, 0x00, 0xbb, 0xb7, 0x6a); +DEFINE_GUID(GUID_ColorControlCallbacks, 0xefd60cc2, 0x49e7, 0x11d0, 0x88, 0x9d, 0x00, 0xaa, 0x00, 0xbb, 0xb7, 0x6a); +DEFINE_GUID(GUID_VideoPortCaps, 0xefd60cc3, 0x49e7, 0x11d0, 0x88, 0x9d, 0x00, 0xaa, 0x00, 0xbb, 0xb7, 0x6a); +DEFINE_GUID(GUID_D3DCallbacks2, 0x0ba584e1, 0x70b6, 0x11d0, 0x88, 0x9d, 0x00, 0xaa, 0x00, 0xbb, 0xb7, 0x6a); +DEFINE_GUID(GUID_D3DCallbacks3, 0xddf41230, 0xec0a, 0x11d0, 0xa9, 0xb6, 0x00, 0xaa, 0x00, 0xc0, 0x99, 0x3e); +DEFINE_GUID(GUID_NonLocalVidMemCaps, 0x86c4fa80, 0x8d84, 0x11d0, 0x94, 0xe8, 0x00, 0xc0, 0x4f, 0xc3, 0x41, 0x37); +DEFINE_GUID(GUID_KernelCallbacks, 0x80863800, 0x6B06, 0x11D0, 0x9B, 0x06, 0x0, 0xA0, 0xC9, 0x03, 0xA3, 0xB8); +DEFINE_GUID(GUID_KernelCaps, 0xFFAA7540, 0x7AA8, 0x11D0, 0x9B, 0x06, 0x00, 0xA0, 0xC9, 0x03, 0xA3, 0xB8); +DEFINE_GUID(GUID_D3DExtendedCaps, 0x7de41f80, 0x9d93, 0x11d0, 0x89, 0xab, 0x0, 0xa0, 0xc9, 0x5, 0x41, 0x29); +DEFINE_GUID(GUID_ZPixelFormats, 0x93869880, 0x36cf, 0x11d1, 0x9b, 0x1b, 0x0, 0xaa, 0x0, 0xbb, 0xb8, 0xae); +DEFINE_GUID(GUID_DDMoreSurfaceCaps, 0x3b8a0466, 0xf269, 0x11d1, 0x88, 0x0b, 0x0, 0xc0, 0x4f, 0xd9, 0x30, 0xc5); +DEFINE_GUID(GUID_DDStereoMode, 0xf828169c, 0xa8e8, 0x11d2, 0xa1, 0xf2, 0x0, 0xa0, 0xc9, 0x83, 0xea, 0xf6); +DEFINE_GUID(GUID_OptSurfaceKmodeInfo, 0xe05c8472, 0x51d4, 0x11d1, 0x8c, 0xce, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); +DEFINE_GUID(GUID_OptSurfaceUmodeInfo, 0x9d792804, 0x5fa8, 0x11d1, 0x8c, 0xd0, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); +DEFINE_GUID(GUID_UserModeDriverInfo, 0xf0b0e8e2, 0x5f97, 0x11d1, 0x8c, 0xd0, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); +DEFINE_GUID(GUID_UserModeDriverPassword, 0x97f861b6, 0x60a1, 0x11d1, 0x8c, 0xd0, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); +DEFINE_GUID(GUID_D3DParseUnknownCommandCallback, 0x2e04ffa0, 0x98e4, 0x11d1, 0x8c, 0xe1, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); +DEFINE_GUID(GUID_MotionCompCallbacks, 0xb1122b40, 0x5dA5, 0x11d1, 0x8f, 0xcF, 0x00, 0xc0, 0x4f, 0xc2, 0x9b, 0x4e); +DEFINE_GUID(GUID_Miscellaneous2Callbacks, 0x406B2F00, 0x3E5A, 0x11D1, 0xB6, 0x40, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x6A); +#endif + +#ifndef _WIN32 +#undef E_NOTIMPL +#undef E_OUTOFMEMORY +#undef E_INVALIDARG +#undef E_FAIL +#define E_NOTIMPL 0x80004001L +#define E_OUTOFMEMORY 0x8007000EL +#define E_INVALIDARG 0x80070057L +#define E_FAIL 0x80004005L +#endif + + /*********************************************************************** ****** * Initialization stuff */ @@ -152,15 +207,15 @@ -#ifndef __DDK_DDRAWINT_H + #define VIDMEM_ISLINEAR 0x00000001 #define VIDMEM_ISRECTANGULAR 0x00000002 #define VIDMEM_ISHEAP 0x00000004 #define VIDMEM_ISNONLOCAL 0x00000008 #define VIDMEM_ISWC 0x00000010 #define VIDMEM_ISDISABLED 0x00000020 -#endif + typedef struct _VIDMEMINFO { FLATPTR fpPrimary; DWORD dwFlags; @@ -612,6 +667,21 @@ #define DDKERNELCALLBACKSSIZE sizeof(DDHAL_DDKERNELCALLBACKS) #define DDMOTIONCOMPCALLBACKSSIZE sizeof( DDHAL_DDMOTIONCOMPCALLBACKS ) +#define MAX_PALETTE_SIZE 256 + +#define MAX_AUTOFLIP_BUFFERS 10 +#define DDSCAPS2_INDEXBUFFER DDSCAPS2_RESERVED3 +#define DDSCAPS3_VIDEO DDSCAPS3_RESERVED2 +#define D3DFMT_INTERNAL_D32 71 +#define D3DFMT_INTERNAL_S1D15 72 +#define D3DFMT_INTERNAL_D15S1 73 +#define D3DFMT_INTERNAL_S8D24 74 +#define D3DFMT_INTERNAL_D24S8 75 +#define D3DFMT_INTERNAL_X8D24 76 +#define D3DFMT_INTERNAL_D24X8 77 +#define DDHAL_PLEASEALLOC_BLOCKSIZE 0x00000002l +#define DDHAL_PLEASEALLOC_LINEARSIZE 0x00000003l + #define DDHAL_CB32_DESTROYDRIVER 0x00000001l #define DDHAL_CB32_CREATESURFACE 0x00000002l #define DDHAL_CB32_SETCOLORKEY 0x00000004l @@ -1084,14 +1154,18 @@ /*********************************************************************** ****** * high-level ddraw implementation structures */ -#ifndef _NO_COM typedef struct _IUNKNOWN_LIST { struct _IUNKNOWN_LIST * lpLink; LPGUID lpGuid; + +#ifndef _NO_COM IUnknown * lpIUnknown; +#else + LPVOID lpIUnknown; +#endif /* _NO_COM */ } IUNKNOWN_LIST,*LPIUNKNOWN_LIST; -#endif /* _NO_COM */ + typedef struct _PROCESS_LIST { struct _PROCESS_LIST * lpLink; DWORD dwProcessId; @@ -1136,7 +1210,7 @@ DWORD dwIntRefCnt; } DDRAWI_DIRECTDRAW_INT; -#ifndef _NO_COM + typedef struct _DDRAWI_DIRECTDRAW_LCL { DWORD lpDDMore; LPDDRAWI_DIRECTDRAW_GBL lpGbl; @@ -1144,7 +1218,11 @@ DWORD dwLocalFlags; DWORD dwLocalRefCnt; DWORD dwProcessId; +#ifndef _NO_COM IUnknown * pUnkOuter; +#else + PVOID pUnkOuter; +#endif DWORD dwObsolete1; ULONG_PTR hWnd; ULONG_PTR hDC; @@ -1154,7 +1232,11 @@ DWORD dwPreferredMode; /* DirectX 2 */ HINSTANCE hD3DInstance; +#ifndef _NO_COM IUnknown * pD3DIUnknown; +#else + PVOID pD3DIUnknown; +#endif LPDDHAL_CALLBACKS lpDDCB; ULONG_PTR hDDVxd; /* DirectX 5.0 */ @@ -1169,8 +1251,8 @@ ULONG_PTR hGammaCalibrator; LPDDGAMMACALIBRATORPROC lpGammaCalibrator; } DDRAWI_DIRECTDRAW_LCL; -#endif /* _NO_COM */ + #define DDRAWILCL_HASEXCLUSIVEMODE 0x00000001 #define DDRAWILCL_ISFULLSCREEN 0x00000002 #define DDRAWILCL_SETCOOPCALLED 0x00000004 @@ -1394,10 +1476,24 @@ #define GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl) \ (*(((LPDDRAWI_DDRAWSURFACE_GBL_MORE *)(psurf_gbl)) - 1)) +#define SURFACE_PHYSICALVIDMEM( psurf_gbl ) \ + ( GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl )->fpPhysicalVidMem ) +typedef struct _DISPLAYMODEINFO +{ + WORD wWidth; + WORD wHeight; + BYTE wBPP; + BYTE wMonitorsAttachedToDesktop; + WORD wRefreshRate; +} DISPLAYMODEINFO, *LPDISPLAYMODEINFO; -#ifndef _NO_COM +#define EQUAL_DISPLAYMODE ( A, B ) (0 == memcmp(&(A), &(B), sizeof (DISPLAYMODEINFO))) + + + + typedef struct _DDRAWI_DDRAWSURFACE_MORE { DWORD dwSize; IUNKNOWN_LIST * lpIUnknowns; @@ -1423,6 +1519,9 @@ LPDWORD lpGammaRamp; LPDWORD lpOriginalGammaRamp; LPVOID lpDDrawReserved6; + #ifndef WIN95 + DISPLAYMODEINFO dmiDDrawReserved7; + #endif DWORD dwSurfaceHandle; DWORD qwDDrawReserved8[2]; LPVOID lpDDrawReserved9; @@ -1432,43 +1531,9 @@ DWORD dwFVF; LPVOID lpVB; } DDRAWI_DDRAWSURFACE_MORE; -#else -typedef struct _DDRAWI_DDRAWSURFACE_MORE { - DWORD dwSize; - PVOID lpIUnknowns; - LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; - DWORD dwPageLockCount; - DWORD dwBytesAllocated; - LPDDRAWI_DIRECTDRAW_INT lpDD_int; - DWORD dwMipMapCount; - LPDDRAWI_DDRAWCLIPPER_INT lpDDIClipper; - /* DirectX 5.0 */ - LPHEAPALIASINFO lpHeapAliasInfo; - DWORD dwOverlayFlags; - VOID *rgjunc; - LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - LPDDOVERLAYFX lpddOverlayFX; - DDSCAPSEX ddsCapsEx; - DWORD dwTextureStage; - LPVOID lpDDRAWReserved; - LPVOID lpDDRAWReserved2; - LPVOID lpDDrawReserved3; - DWORD dwDDrawReserved4; - LPVOID lpDDrawReserved5; - LPDWORD lpGammaRamp; - LPDWORD lpOriginalGammaRamp; - LPVOID lpDDrawReserved6; - DWORD dwSurfaceHandle; - DWORD qwDDrawReserved8[2]; - LPVOID lpDDrawReserved9; - DWORD cSurfaces; - LPDDSURFACEDESC2 pCreatedDDSurfaceDesc2; - LPDDRAWI_DDRAWSURFACE_LCL *slist; - DWORD dwFVF; - LPVOID lpVB; -} DDRAWI_DDRAWSURFACE_MORE; -#endif /* _NO_COM */ + + typedef struct _DDRAWI_DDRAWSURFACE_LCL { LPDDRAWI_DDRAWSURFACE_MORE lpSurfMore; LPDDRAWI_DDRAWSURFACE_GBL lpGbl; @@ -1479,8 +1544,16 @@ DWORD dwProcessId; DWORD dwFlags; DDSCAPS ddsCaps; + union + { LPDDRAWI_DDRAWPALETTE_INT lpDDPalette; - LPDDRAWI_DDRAWCLIPPER_LCL lpDDClipper; + LPDDRAWI_DDRAWPALETTE_INT lp16DDPalette; + }; + union + { + LPDDRAWI_DDRAWCLIPPER_LCL lpDDClipper; + LPDDRAWI_DDRAWCLIPPER_INT lp16DDClipper; + }; DWORD dwModeCreatedIn; DWORD dwBackBufferCount; DDCOLORKEY ddckCKDestBlt; @@ -1573,13 +1646,84 @@ #define DDRAWIPAL_STORED_8INDEX 0x00001000 #define DDRAWIPAL_ALPHA 0x00002000 -#ifndef _NO_COM +#define D3DFORMAT_OP_TEXTURE 0x00000001L +#define D3DFORMAT_OP_VOLUMETEXTURE 0x00000002L +#define D3DFORMAT_OP_CUBETEXTURE 0x00000004L +#define D3DFORMAT_OP_OFFSCREEN_RENDERTARGET 0x00000008L +#define D3DFORMAT_OP_SAME_FORMAT_RENDERTARGET 0x00000010L +#define D3DFORMAT_OP_ZSTENCIL 0x00000040L +#define D3DFORMAT_OP_ZSTENCIL_WITH_ARBITRARY_COLOR_DEPTH 0x00000080L +#define D3DFORMAT_OP_SAME_FORMAT_UP_TO_ALPHA_RENDERTARGET 0x00000100L +#define D3DFORMAT_OP_DISPLAYMODE 0x00000400L +#define D3DFORMAT_OP_3DACCELERATION 0x00000800L +#define D3DFORMAT_OP_PIXELSIZE 0x00001000L +#define D3DFORMAT_OP_CONVERT_TO_ARGB 0x00002000L +#define D3DFORMAT_OP_OFFSCREENPLAIN 0x00004000L +#define D3DFORMAT_OP_SRGBREAD 0x00008000L +#define D3DFORMAT_OP_BUMPMAP 0x00010000L +#define D3DFORMAT_OP_NOFILTER 0x00040000L +#define DDPF_D3DFORMAT 0x00200000l +#define DDPF_NOVEL_TEXTURE_FORMAT 0x00100000l +#define D3DFORMAT_MEMBEROFGROUP_ARGB 0x00080000L +#define D3DFORMAT_OP_SRGBWRITE 0x00100000L +#define D3DFORMAT_OP_NOALPHABLEND 0x00200000L +#define D3DFORMAT_OP_AUTOGENMIPMAP 0x00400000L +#define D3DFORMAT_OP_VERTEXTEXTURE 0x00800000L +#define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L +#define DELETED_OK 0 +#define DELETED_LASTONE 1 +#define DELETED_NOTFOUND 2 +#define DDCALLBACKSSIZE_V1 ( offsetof( DDHAL_DDCALLBACKS, SetExclusiveMode ) ) +#define DDCALLBACKSSIZE sizeof( DDHAL_DDCALLBACKS ) +#define DDRAWICLIP_WATCHWINDOW 0x00000001 +#define DDRAWICLIP_ISINITIALIZED 0x00000002 +#define DDRAWICLIP_INMASTERSPRITELIST 0x00000004 +#define PFINDEX_UNINITIALIZED (0UL) +#define PFINDEX_UNSUPPORTED (~0UL) +#define ROP_HAS_SOURCE 0x00000001 +#define ROP_HAS_PATTERN 0x00000002 +#define ROP_HAS_SOURCEPATTERN ROP_HAS_PATTERN | ROP_HAS_SOURCE +#define DDRAWIVPORT_ON 0x00000001 +#define DDRAWIVPORT_SOFTWARE_AUTOFLIP 0x00000002 +#define DDRAWIVPORT_COLORKEYANDINTERP 0x00000004 +#define DDRAWIVPORT_NOKERNELHANDLES 0x00000008 +#define DDRAWIVPORT_SOFTWARE_BOB 0x00000010 +#define DDRAWIVPORT_VBION 0x00000020 +#define DDRAWIVPORT_VIDEOON 0x00000040 +#define DDRAWI_GETCOLOR 0x0001 +#define DDRAWI_SETCOLOR 0x0002 +#define DDMCQUERY_READ 0x00000001 +#define DDWAITVB_I_TESTVB 0x80000006 + + +#define DDBLT_ANYALPHA \ + (DDBLT_ALPHASRCSURFACEOVERRIDE | DDBLT_ALPHASRCCONSTOVERRIDE | \ + DDBLT_ALPHASRC | DDBLT_ALPHADESTSURFACEOVERRIDE | \ + DDBLT_ALPHADESTCONSTOVERRIDE | DDBLT_ALPHADEST) + +#define DDHAL_ALIGNVALIDCAPS (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_EXECUTEBUFFER | \ + DDSCAPS_OVERLAY | DDSCAPS_TEXTURE | \ + DDSCAPS_ZBUFFER | DDSCAPS_ALPHA | DDSCAPS_FLIP ) + + +#define DDHALINFOSIZE_V2 sizeof(DDHALINFO) + +#define DDOVER_ANYALPHA \ + (DDOVER_ALPHASRCSURFACEOVERRIDE | DDOVER_ALPHASRCCONSTOVERRIDE | \ + DDOVER_ALPHASRC | DDOVER_ALPHADESTSURFACEOVERRIDE | \ + DDOVER_ALPHADESTCONSTOVERRIDE | DDOVER_ALPHADEST) + + typedef struct _DDRAWI_DDRAWPALETTE_LCL { DWORD lpPalMore; LPDDRAWI_DDRAWPALETTE_GBL lpGbl; ULONG_PTR dwUnused0; DWORD dwLocalRefCnt; +#ifndef _NO_COM IUnknown * pUnkOuter; +#else + PVOID pUnkOuter; +#endif LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; ULONG_PTR dwReserved1; /* DirectX 6.0 */ @@ -1587,7 +1731,6 @@ ULONG_PTR dwDDRAWReserved2; ULONG_PTR dwDDRAWReserved3; } DDRAWI_DDRAWPALETTE_LCL; -#endif /* _NO_COM */ typedef struct _DDMCCOMPBUFFERINFO @@ -1847,6 +1990,196 @@ LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; } DDHAL_WAITFORVERTICALBLANKDATA; +typedef struct _DDHAL_DRVSETCOLORKEYDATA +{ + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwFlags; + DDCOLORKEY ckNew; + HRESULT ddRVal; + LPDDHAL_SETCOLORKEY SetColorKey; +} DDHAL_DRVSETCOLORKEYDATA; + +typedef struct _DDMONITORINFO +{ + WORD Manufacturer; + WORD Product; + DWORD SerialNumber; + GUID DeviceIdentifier; + int Mode640x480; + int Mode800x600; + int Mode1024x768; + int Mode1280x1024; + int Mode1600x1200; + int ModeReserved1; + int ModeReserved2; + int ModeReserved3; +} DDMONITORINFO, FAR *LPDDMONITORINFO; + +typedef struct _DDRAWI_DDRAWCLIPPER_INT +{ + LPVOID lpVtbl; + LPDDRAWI_DDRAWCLIPPER_LCL lpLcl; + LPDDRAWI_DDRAWCLIPPER_INT lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDRAWCLIPPER_INT; + +typedef struct _DDHAL_UPDATENONLOCALHEAPDATA +{ + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwHeap; + FLATPTR fpGARTLin; + FLATPTR fpGARTDev; + ULONG_PTR ulPolicyMaxBytes; + HRESULT ddRVal; + LPDDHAL_UPDATENONLOCALHEAP UpdateNonLocalHeap; +} DDHAL_UPDATENONLOCALHEAPDATA; + +typedef struct _DDHAL_SETCLIPLISTDATA +{ + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + HRESULT ddRVal; + LPDDHALSURFCB_SETCLIPLIST SetClipList; +} DDHAL_SETCLIPLISTDATA; + +typedef struct _DDRAWI_DDMOTIONCOMP_LCL +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + GUID guid; + DWORD dwUncompWidth; + DWORD dwUncompHeight; + DDPIXELFORMAT ddUncompPixelFormat; + DWORD dwInternalFlags; + DWORD dwRefCnt; + DWORD dwProcessId; + HANDLE hMoComp; + DWORD dwDriverReserved1; + DWORD dwDriverReserved2; + DWORD dwDriverReserved3; + LPVOID lpDriverReserved1; + LPVOID lpDriverReserved2; + LPVOID lpDriverReserved3; +} DDRAWI_DDMOTIONCOMP_LCL; + +typedef struct _DDRAWI_DDMOTIONCOMP_INT +{ + LPVOID lpVtbl; + LPDDRAWI_DDMOTIONCOMP_LCL lpLcl; + LPDDRAWI_DDMOTIONCOMP_INT lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDMOTIONCOMP_INT; + + +typedef struct _DDRAWI_DDVIDEOPORT_LCL +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + DDVIDEOPORTDESC ddvpDesc; + DDVIDEOPORTINFO ddvpInfo; + LPDDRAWI_DDRAWSURFACE_INT lpSurface; + LPDDRAWI_DDRAWSURFACE_INT lpVBISurface; + LPDDRAWI_DDRAWSURFACE_INT *lpFlipInts; + DWORD dwNumAutoflip; + DWORD dwProcessID; + DWORD dwStateFlags; + DWORD dwFlags; + DWORD dwRefCnt; + FLATPTR fpLastFlip; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; + HANDLE hDDVideoPort; + DWORD dwNumVBIAutoflip; + LPDDVIDEOPORTDESC lpVBIDesc; + LPDDVIDEOPORTDESC lpVideoDesc; + LPDDVIDEOPORTINFO lpVBIInfo; + LPDDVIDEOPORTINFO lpVideoInfo; + DWORD dwVBIProcessID; + LPDDRAWI_DDVIDEOPORT_INT lpVPNotify; +} DDRAWI_DDVIDEOPORT_LCL; + + +typedef struct _DDRAWI_DDVIDEOPORT_INT +{ + LPVOID lpVtbl; + LPDDRAWI_DDVIDEOPORT_LCL lpLcl; + LPDDRAWI_DDVIDEOPORT_INT lpLink; + DWORD dwIntRefCnt; + DWORD dwFlags; +} DDRAWI_DDVIDEOPORT_INT; + + +typedef struct _DDRAWI_DDRAWCLIPPER_LCL +{ + DWORD lpClipMore; + LPDDRAWI_DDRAWCLIPPER_GBL lpGbl; + LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; + DWORD dwLocalRefCnt; +#ifndef _NO_COM + IUnknown *pUnkOuter; +#else + PVOID *pUnkOuter; +#endif + LPDDRAWI_DIRECTDRAW_INT lpDD_int; + ULONG_PTR dwReserved1; +#ifndef _NO_COM + IUnknown * pAddrefedThisOwner; +#else + PVOID pAddrefedThisOwner; +#endif +} DDRAWI_DDRAWCLIPPER_LCL; + + + +typedef struct _DDRAWI_DDRAWCLIPPER_GBL +{ + DWORD dwRefCnt; + DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwProcessId; + ULONG_PTR dwReserved1; + ULONG_PTR hWnd; + LPRGNDATA lpStaticClipList; +} DDRAWI_DDRAWCLIPPER_GBL; + +typedef BOOL (PASCAL *LPDDHEL_INIT)(LPDDRAWI_DIRECTDRAW_GBL,BOOL); + +extern HRESULT DDAPI + LateAllocateSurfaceMem( + LPDIRECTDRAWSURFACE lpSurface, + DWORD dwPleaseAllocType, + DWORD dwWidthInBytesOrSize, + DWORD dwHeight); + + LPDIRECTDRAWSURFACE GetNextMipMap( + LPDIRECTDRAWSURFACE lpLevel); + + + +typedef struct IDirectDrawClipperVtbl DIRECTDRAWCLIPPERCALLBACKS; +typedef struct IDirectDrawPaletteVtbl DIRECTDRAWPALETTECALLBACKS; +typedef struct IDirectDrawSurfaceVtbl DIRECTDRAWSURFACECALLBACKS; +typedef struct IDirectDrawSurface2Vtbl DIRECTDRAWSURFACE2CALLBACKS; +typedef struct IDirectDrawSurface3Vtbl DIRECTDRAWSURFACE3CALLBACKS; +typedef struct IDirectDrawSurface4Vtbl DIRECTDRAWSURFACE4CALLBACKS; +typedef struct IDirectDrawSurface7Vtbl DIRECTDRAWSURFACE7CALLBACKS; +typedef struct IDirectDrawColorControlVtbl DIRECTDRAWCOLORCONTROLCALLBACKS; +typedef struct IDirectDrawVtbl DIRECTDRAWCALLBACKS; +typedef struct IDirectDraw2Vtbl DIRECTDRAW2CALLBACKS; +typedef struct IDirectDraw4Vtbl DIRECTDRAW4CALLBACKS; +typedef struct IDirectDraw7Vtbl DIRECTDRAW7CALLBACKS; +typedef struct IDirectDrawKernelVtbl DIRECTDRAWKERNELCALLBACKS; +typedef struct IDirectDrawSurfaceKernelVtbl DIRECTDRAWSURFACEKERNELCALLBACKS; +typedef struct IDirectDrawGammaControlVtbl DIRECTDRAWGAMMACONTROLCALLBACKS; + + +typedef DIRECTDRAWCLIPPERCALLBACKS FAR *LPDIRECTDRAWCLIPPERCALLBACKS; +typedef DIRECTDRAWPALETTECALLBACKS FAR *LPDIRECTDRAWPALETTECALLBACKS; +typedef DIRECTDRAWSURFACECALLBACKS FAR *LPDIRECTDRAWSURFACECALLBACKS; +typedef DIRECTDRAWCALLBACKS FAR *LPDIRECTDRAWCALLBACKS; + +HRESULT CALLBACK + D3DParseUnknownCommand (LPVOID lpvCommands, + LPVOID *lplpvReturnedCommand); + #ifdef __cplusplus } /* extern "C" */ #endif _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-16 17:11:48 UTC (rev 18501) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-16 18:21:20 UTC (rev 18502) @@ -883,8 +883,8 @@ /* IDirectDrawColorControl callbacks */ /*********************************************************************** */ -#define DDRAWI_GETCOLOR 1 -#define DDRAWI_SETCOLOR 2 +#define DDRAWI_GETCOLOR 0x0001 +#define DDRAWI_SETCOLOR 0x0002 typedef struct { @@ -1028,7 +1028,7 @@ } DD_RENDERMOCOMPDATA, *PDD_RENDERMOCOMPDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_RENDER)(PDD_RENDERMOCOMPDATA); -#define DDMCQUERY_READ 1 +#define DDMCQUERY_READ 0x00000001 typedef struct {

19 years, 2 months

[ekohl] 18501: Fix typos and remove trailing whitespace.

by ekohl＠svn.reactos.com

Fix typos and remove trailing whitespace. Modified: trunk/reactos/subsys/system/cmd/De.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-10-16 16:21:59 UTC (rev 18500) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-10-16 17:11:48 UTC (rev 18501) @@ -46,7 +46,7 @@ CHDIR[..|.]\n\ CD [Laufwerk:][Pfad]\n\ CD[..|.]\n\n\ - .. uebergeordnete Verzeichnis\n\ + .. uebergeordnetes Verzeichnis\n\ . vorhergehende Verzeichnis\n\n\ Geben Sie CD Laufwerk: ein, um das aktuelle Verzeichnis auf dem angegebenen\n\ Laufwerk anzuzeigen.\n\ @@ -141,7 +141,7 @@ /T nur Datum anzeigen\n\n\ Der Befehl DATE ohne Parameter zeigt das aktuelle Datum an und fragt nach\n\ einem neuen. Druecken Sie die EINGABETASTE, um das bisherige Datum zu behalten." - + STRING_DEL_HELP1, "Loescht eine oder mehrere Dateien.\n\n\ DEL [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ DELETE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ @@ -205,7 +205,7 @@ STRING_DIR_HELP3, " Datentraeger in Laufwerk %c hat keinen Namen\n" STRING_DIR_HELP4, " Datentraeger-Seriennummer ist %04X-%04X\n" STRING_DIR_HELP5, "\n Gelistete Dateien:\n%16i Datei(en)% 14s bytes\n" -STRING_DIR_HELP6, "%16i VErzeichnis(se)% 15s bytes\n" +STRING_DIR_HELP6, "%16i Verzeichnis(se)% 15s bytes\n" STRING_DIR_HELP7, "\n Verzeichnisse %s\n\n" STRING_DIR_HELP8, "%16i Datei(en)% 14s bytes\n" @@ -383,7 +383,7 @@ STRING_REN_HELP2, " %lu Datei umbennant\n" STRING_REN_HELP3, " %lu Dateien umbennant\n" - + STRING_SHIFT_HELP, "Veraendert die Position ersetzbarer Parameter in einem Batchprogramm.\n\n\ SHIFT [DOWN]" @@ -597,7 +597,7 @@ STRING_ERROR_ERROR2, "Syntax-Fehler" STRING_FOR_ERROR1, "'in' fehlt fuer ein statement." STRING_FOR_ERROR2, "Klammern nicht gefunden." -STRING_FOR_ERROR3, "'do' fehlt." +STRING_FOR_ERROR3, "'do' fehlt." STRING_FOR_ERROR4, "kein Befehl nach 'do'." STRING_FREE_ERROR1, "Ungueltiges Laufwerk" STRING_FREE_ERROR2, "keine Bezeichnung" @@ -635,7 +635,7 @@ STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" STRING_CMD_SHELLINFO, "\nReactOS Befehlszeilen Interpreter" -STRING_VERSION_RUNVER, " laeft in %s" +STRING_VERSION_RUNVER, " laeuft in %s" STRING_COPY_FILE , " %d Datei(en) kopiert\n" STRING_DELETE_WIPE, "wiped" STRING_FOR_ERROR, "ungueltige Variablenangabe."

19 years, 2 months

[cwittich] 18500: fixed some typos

by cwittich＠svn.reactos.com

fixed some typos Modified: trunk/reactos/subsys/system/taskmgr/De.rc _____ Modified: trunk/reactos/subsys/system/taskmgr/De.rc --- trunk/reactos/subsys/system/taskmgr/De.rc 2005-10-16 15:27:38 UTC (rev 18499) +++ trunk/reactos/subsys/system/taskmgr/De.rc 2005-10-16 16:21:59 UTC (rev 18500) @@ -652,7 +652,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TAB_APPS "Anwendnungen" + IDS_TAB_APPS "Anwendungen" IDS_TAB_PROCESSES "Prozesse" IDS_TAB_PERFORMANCE "Systemleistung" IDS_TAB_TASK "Anwendung" @@ -660,7 +660,7 @@ IDS_TAB_IMAGENAME "Name" IDS_TAB_PID "PID" IDS_TAB_USERNAME "Benutzername" - IDS_TAB_SESSIONID "Sitzungserkennung" + IDS_TAB_SESSIONID "Sitzungskennung" IDS_TAB_CPU "CPU-Auslastung" IDS_TAB_CPUTIME "CPU-Zeit" IDS_TAB_MEMUSAGE "Speicherauslastung" @@ -702,7 +702,7 @@ IDS_MSG_TASKMGRWARNING "Warnung vom Task-Manager" IDS_MSG_WARNINGTERMINATING "WARNUNG: Das Abbrechen eines Prozesses kann zu\nunerw³nschten Ergebnissen, einschlie?lich Datenverlust und\nSysteminstabilitõt, f³hren. Zustand und Daten des Prozesses\nwerden nicht mher gespeichert. Sind Sie sicher, dass Sie\nden Prozess abbrechen m÷chten?" IDS_MSG_UNABLETERMINATEPRO "Kann den Prozess nicht beenden" - IDS_MSG_UNABLECHANGEPRIORITY "Kann die Prioritñt nicht ñndern" + IDS_MSG_UNABLECHANGEPRIORITY "Kann die Prioritõt nicht ñndern" IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das ?ndern der Prioritõtsklasse dieses Prozesses\nkann zu unerw³nschten Ergebnissen, einschl. Systeminstabilitõt, f³hren.\nSind Sie sicher, dass Sie õndern m÷chten?" IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%" IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %dK / %dK"

19 years, 2 months

[ekohl] 18499: Fix [out, size_is, unique] parameter issues.

by ekohl＠svn.reactos.com

Fix [out, size_is, unique] parameter issues. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-10-16 14:24:11 UTC (rev 18498) +++ trunk/reactos/tools/widl/ChangeLog 2005-10-16 15:27:38 UTC (rev 18499) @@ -1,5 +1,12 @@ ChangeLog +2005-10-16 ekohl + + tools/widl/client.c + tools/widl/server.c + +- Fix [out, size_is, unique] parameter issues. + 2005-10-09 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-10-16 14:24:11 UTC (rev 18498) +++ trunk/reactos/tools/widl/client.c 2005-10-16 15:27:38 UTC (rev 18499) @@ -518,7 +518,13 @@ if (type != NULL) type_type = type->type; - print_client("0x11, 0x00, /* FC_RP */\n"); + if (ref_attr) + print_client("0x11, 0x00, /* FC_RP */\n"); + else if (unique_attr) + print_client("0x12, 0x00, /* FC_UP */\n"); + else if (ptr_attr) + print_client("0x14, 0x00, /* FC_FP */\n"); + print_client("NdrFcShort(0x02),\n"); if (string_attr) @@ -873,10 +879,6 @@ if ((var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - if (ptr_attr) - { - /* FIXME: not supported yet */ - } if (ref_attr) { print_client("NdrConformantStringBufferSize(\n"); @@ -899,6 +901,10 @@ nothing_printed = 1; indent--; } + else if (ptr_attr) + { + /* FIXME: not supported yet */ + } } } else @@ -910,14 +916,32 @@ ((var_t *)sizeis_attr)->name); fprintf(client, "\n"); - print_client("NdrConformantArrayBufferSize(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - local_type_offset + 4); - indent--; - nothing_printed = 1; + if (ref_attr) + { + print_client("NdrConformantArrayBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + indent--; + nothing_printed = 1; + } + else if (unique_attr) + { + print_client("NdrPointerBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset); + nothing_printed = 1; + indent--; + } + else if (ptr_attr) + { + /* FIXME: not supported yet */ + } } } } @@ -945,6 +969,7 @@ int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; var_t *var; + int default_align = 0; if (!func->args) return; @@ -980,25 +1005,25 @@ string_attr = is_attr(var->attrs, ATTR_STRING); sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); - if (sizeis_attr) + if (ref_attr) { - print_client("_StubMsg.MaxCount = %s;\n", - ((var_t *)sizeis_attr)->name); - fprintf(client, "\n"); + if (sizeis_attr) + { + print_client("_StubMsg.MaxCount = %s;\n", + ((var_t *)sizeis_attr)->name); + fprintf(client, "\n"); - print_client("NdrConformantArrayMarshall(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - local_type_offset + 4); - indent--; - fprintf(client, "\n"); - print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(client, "\n"); - } - else if (ref_attr) - { + print_client("NdrConformantArrayMarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + indent--; + fprintf(client, "\n"); + default_align = 1; + } + else if (string_attr && (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { @@ -1010,8 +1035,7 @@ local_type_offset + 2); indent--; fprintf(client, "\n"); - print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(client, "\n"); + default_align = 1; } else { @@ -1060,6 +1084,13 @@ if (size != 0) { + if (default_align) + { + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); + default_align = 0; + } + else if (alignment != 0) print_client("_StubMsg.Buffer += %u;\n", alignment); @@ -1081,6 +1112,13 @@ } else if (unique_attr) { + if (sizeis_attr) + { + print_client("_StubMsg.MaxCount = %s;\n", + ((var_t *)sizeis_attr)->name); + fprintf(client, "\n"); + } + print_client("NdrPointerMarshall(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); @@ -1089,6 +1127,7 @@ local_type_offset); indent--; fprintf(client, "\n"); + default_align = 1; } } else @@ -1140,6 +1179,14 @@ if (size != 0) { + if (default_align) + { + fprintf(client, "\n"); + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); + default_align = 0; + } + else if (alignment != 0) print_client("_StubMsg.Buffer += %u;\n", alignment); @@ -1170,6 +1217,7 @@ local_type_offset + 4); indent--; fprintf(client, "\n"); + default_align = 1; } } } @@ -1193,6 +1241,7 @@ var_t *var; var_t *def; unsigned int local_type_offset = *type_offset; + int default_align = 0; def = func->def; @@ -1236,8 +1285,7 @@ print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); - print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(client, "\n"); + default_align = 1; } else { @@ -1251,8 +1299,7 @@ print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); - print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(client, "\n"); + default_align = 1; } } else if (is_base_type(var->type)) @@ -1304,12 +1351,9 @@ { if (var->ptr_level == 1) { - fprintf(client, "\n"); - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); - if (unique_attr) { + fprintf(client, "\n"); print_client("NdrPointerUnmarshall(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); @@ -1319,9 +1363,22 @@ print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); + default_align = 1; } else { + fprintf(client, "\n"); + if (default_align) + { + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); + default_align = 0; + } + else + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); + + print_client("*"); write_name(client, var); fprintf(client, " = *(("); @@ -1351,6 +1408,7 @@ print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); + default_align = 1; } } else @@ -1400,6 +1458,13 @@ } fprintf(client, "\n"); + if (default_align) + { + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); + default_align = 0; + } + else if (alignment != 0) print_client("_StubMsg.Buffer += %u;\n", alignment); print_client("_RetVal = *(("); _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-10-16 14:24:11 UTC (rev 18498) +++ trunk/reactos/tools/widl/server.c 2005-10-16 15:27:38 UTC (rev 18499) @@ -515,7 +515,12 @@ if (type != NULL) type_type = type->type; - print_server("0x11, 0x00, /* FC_RP */\n"); + if (ref_attr) + print_server("0x11, 0x00, /* FC_RP */\n"); + else if (unique_attr) + print_server("0x12, 0x00, /* FC_UP */\n"); + else if (ptr_attr) + print_server("0x14, 0x00, /* FC_FP */\n"); print_server("NdrFcShort(0x02),\n"); if (string_attr) @@ -622,7 +627,7 @@ int last_size = -1; int in_attr; int out_attr; - int string_attr; + int string_attr, unique_attr; void *sizeis_attr; int empty_line; var_t *var; @@ -892,6 +897,7 @@ out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); string_attr = is_attr(var->attrs, ATTR_STRING); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); /* set 'in' attribute if neither 'in' nor 'out' is found */ if (!out_attr && !in_attr) @@ -899,6 +905,7 @@ if (var->ptr_level == 1 && string_attr && + unique_attr == 0 && (var->type->type == RPC_FC_BYTE || var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) @@ -968,6 +975,7 @@ int string_attr; int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; + int default_align = 0; if (!func->args) return; @@ -1011,23 +1019,21 @@ print_server("(unsigned char)0);\n"); indent--; fprintf(server, "\n"); - print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(server, "\n"); + default_align = 1; } } else if (sizeis_attr) { - print_server("NdrConformantArrayUnmarshall(\n"); - indent++; - print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); - print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", - local_type_offset + 4); - print_server("(unsigned char)0);\n"); - indent--; - fprintf(server, "\n"); - print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(server, "\n"); + print_server("NdrConformantArrayUnmarshall(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + local_type_offset + 4); + print_server("(unsigned char)0);\n"); + indent--; + fprintf(server, "\n"); + default_align = 1; } else { @@ -1076,6 +1082,13 @@ if (size != 0) { + if (default_align) + { + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); + default_align = 0; + } + else if (alignment != 0) print_server("_StubMsg.Buffer += %u;\n", alignment); @@ -1104,6 +1117,7 @@ print_server("(unsigned char)0);\n"); indent--; fprintf(server, "\n"); + default_align = 1; } } @@ -1156,6 +1170,13 @@ if (size != 0) { + if (default_align) + { + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); + default_align = 0; + } + else if (alignment != 0) print_server("_StubMsg.Buffer += %u;\n", alignment); @@ -1185,6 +1206,7 @@ print_server("(unsigned char)0);\n"); indent--; fprintf(server, "\n"); + default_align = 1; } } } @@ -1208,6 +1230,7 @@ int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; unsigned int local_type_offset = *type_offset; + int default_align = 0; def = func->def; @@ -1249,8 +1272,7 @@ local_type_offset + 4); indent--; fprintf(server, "\n"); - print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(server, "\n"); + default_align = 1; } else { @@ -1269,8 +1291,7 @@ local_type_offset + 4); indent--; fprintf(server, "\n"); - print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(server, "\n"); + default_align = 1; } } else if (is_base_type(var->type)) @@ -1320,9 +1341,6 @@ if (size != 0) { - if (alignment != 0) - print_server("_StubMsg.Buffer += %u;\n", alignment); - if (var->ptr_level == 1) { if (unique_attr) @@ -1335,9 +1353,20 @@ local_type_offset); indent--; fprintf(server, "\n"); + default_align = 1; } else { + if (default_align) + { + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); + default_align = 0; + } + else + if (alignment != 0) + print_server("_StubMsg.Buffer += %u;\n", alignment); + fprintf(server, "\n"); print_server("*(("); write_type(server, var->type, NULL, var->tname); @@ -1369,6 +1398,7 @@ print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", local_type_offset + 4); indent--; + default_align = 1; } } @@ -1411,6 +1441,13 @@ } fprintf(server, "\n"); + if (default_align) + { + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); + default_align = 0; + } + else if (alignment != 0) print_server("_StubMsg.Buffer += %u;\n", alignment); print_server("*(("); @@ -1450,7 +1487,7 @@ static void cleanup_return_buffer(func_t *func, unsigned int *type_offset) { var_t *var; - int string_attr; + int string_attr, unique_attr; void *sizeis_attr; unsigned int local_type_offset = *type_offset; @@ -1464,8 +1501,9 @@ { sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); string_attr = is_attr(var->attrs, ATTR_STRING); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); - if (sizeis_attr != NULL) + if (sizeis_attr != NULL && unique_attr == 0) { if (first_arg == 0) fprintf(server, "\n");

19 years, 2 months

← Newer
1
...
39
40
41
42
43
44
45
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005