Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[weiden] 29230: Don't show prefix in labels filled with hardware information
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 06:05:23 2007 New Revision: 29230 URL: http://svn.reactos.org/svn/reactos?rev=29230&view=rev Log: Don't show prefix in labels filled with hardware information Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 06:05:23 2007 @@ -6,19 +6,19 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Adapter Type", -1, 7, 3, 237, 50 - LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 LTEXT "Chip Type:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX LTEXT "DAC Type:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX LTEXT "Memory Size:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX LTEXT "Adapter String:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX LTEXT "BIOS Information:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX PUSHBUTTON "&List All Modes...", IDC_LISTALLMODES, 7, 139, 75, 14 END

1 0

[tkreuzer] 29229: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2696 for more details.
by tkreuzer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: tkreuzer Date: Thu Sep 27 04:25:42 2007 New Revision: 29229 URL: http://svn.reactos.org/svn/reactos?rev=29229&view=rev Log: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2696 for more details. Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Thu Sep 27 04:25:42 2007 @@ -77,7 +77,7 @@ IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Âêàç³âíèê" +CAPTION "Âêàç³âíèêè" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ñõåìà", -1, 5, 5, 170, 45 @@ -85,7 +85,7 @@ PUSHBUTTON "Çáåðåãòè &ÿê...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "Â&èäàëèòè", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE - LTEXT "&Íàëàøòóâàííÿ", -1, 5, 60, 40, 10 + LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Ââ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&Çà çàìîâ÷óâàííÿì", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 @@ -135,7 +135,7 @@ IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Êîëèñ÷àòêî" +CAPTION "Êîë³ùàòêî" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80 @@ -168,7 +168,7 @@ IDS_SIZEALL "Ïåðåì³ùåííÿ" IDS_UPARROW "Ñïåö³àëüíå âèä³ëåííÿ" IDS_HAND "Âèá³ð ïîñèëàííÿ" - IDS_NONE "(Íåìàº)" + IDS_NONE "(íåìàº)" IDS_SYSTEM_SCHEME "(ñèñòåìíà ñõåìà)" IDS_BROWSE_FILTER "Âêàç³âíèêè (*.ani, *.cur)\0*.ani;*.cur\0Àí³ìîâàí³ âêàç³âíèêè (*.ani)\0*.ani\0Çâè÷àéí³ âêàç³âíèêè (*.cur)\0*.cur\0Óñ³ ôàéëè\0*.*\0\0" IDS_BROWSE_TITLE "Îãëÿä" Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc Thu Sep 27 04:25:42 2007 @@ -32,7 +32,7 @@ IDD_SOUNDS DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Çâóêîâèé ñóïðîâ³ä ïîä³é" +CAPTION "Çâóêè" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Çâóêîâà ñõåìà âèçíà÷àº çâóêè, ÿê³ ñóïðîâîäæóþòü ïîä³¿ â ñèñòåì³ ReactOS ³ ó ïðîãðàìàõ. Ìîæíà âèáðàòè îäíó ç íàÿâíèõ ñõåì àáî ñòâîðèòè íîâó.",-1,8,7,230,40 @@ -107,8 +107,9 @@ BEGIN IDS_CPLNAME "Çâóêîâ³ ³ àóä³î ïðèñòðî¿" IDS_CPLDESCRIPTION "Çì³íà çâóêîâèõ ñõåì âàøîãî êîìï'þòåðà, íàñòðîþâàííÿ êîëîíîê ³ çàïèñóþ÷èõ ïðèñòðî¿â." - IDS_NO_SOUND "(None)" + IDS_NO_SOUND "(íåìàº)" END + Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc Thu Sep 27 04:25:42 2007 @@ -157,7 +157,7 @@ IDS_TIMEOUT7 "÷åðåç 20 õâ" IDS_TIMEOUT8 "÷åðåç 25 õâ" IDS_TIMEOUT9 "÷åðåç 30 õâ" - IDS_TIMEOUT10 "÷åðåç 45 mins" + IDS_TIMEOUT10 "÷åðåç 45 õâ" IDS_TIMEOUT11 "÷åðåç 1 ãîäèíó" IDS_TIMEOUT12 "÷åðåç 2 ãîäèíè" IDS_TIMEOUT13 "÷åðåç 3 ãîäèíè" @@ -166,3 +166,4 @@ IDS_TIMEOUT16 "í³êîëè" END +

1 0

[weiden] 29228: Select currently selected mode by default
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:37:09 2007 New Revision: 29228 URL: http://svn.reactos.org/svn/reactos?rev=29228&view=rev Log: Select currently selected mode by default Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 03:37:09 2007 @@ -85,7 +85,7 @@ HWND hwndListAllModesDlg) { TCHAR szFormat[64], szBuffer[64], szColors[64], szRefreshRate[64]; - PDEVMODEW lpDevMode; + PDEVMODEW lpDevMode, lpCurrentDevMode; DWORD dwIndex = 0; INT i; @@ -98,6 +98,8 @@ { szFormat[0] = TEXT('\0'); } + + lpCurrentDevMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); do { @@ -133,6 +135,15 @@ LB_SETITEMDATA, (WPARAM)i, (LPARAM)lpDevMode); + + if (lpDevMode == lpCurrentDevMode) + { + SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES, + LB_SETCURSEL, + (WPARAM)i, + 0); + } } } @@ -300,7 +311,6 @@ break; case IDC_LISTALLMODES: - MessageBox(hwndDlg, _T("Bla"), NULL, 0); ShowListAllModes(This); break; }

1 0

[weiden] 29227: Fix compilation error
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:17:48 2007 New Revision: 29227 URL: http://svn.reactos.org/svn/reactos?rev=29227&view=rev Log: Fix compilation error Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 03:17:48 2007 @@ -129,7 +129,7 @@ if (i >= 0) { SendDlgItemMessage(hwndListAllModesDlg, - IDC_ALLVALIDMODES. + IDC_ALLVALIDMODES, LB_SETITEMDATA, (WPARAM)i, (LPARAM)lpDevMode);

1 0

[weiden] 29226: Fix CLSID (accidently committed a change for testing purpose)
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:15:42 2007 New Revision: 29226 URL: http://svn.reactos.org/svn/reactos?rev=29226&view=rev Log: Fix CLSID (accidently committed a change for testing purpose) Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 03:15:42 2007 @@ -54,7 +54,7 @@ LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); -static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf9}}; +static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; ULONG __cdecl DbgPrint(PCCH Format,...);

1 0

[weiden] 29225: Implement the "List all modes" dialog, read-only for now
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:10:41 2007 New Revision: 29225 URL: http://svn.reactos.org/svn/reactos?rev=29225&view=rev Log: Implement the "List all modes" dialog, read-only for now Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c trunk/reactos/dll/win32/shellext/deskadp/deskadp.h trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskadp/precomp.h trunk/reactos/dll/win32/shellext/deskadp/resource.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 03:10:41 2007 @@ -6,6 +6,198 @@ static HINSTANCE hInstance; typedef INT_PTR (WINAPI *PDEVICEPROPERTIESEXW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL); + +static VOID +GetColorDescription(PDEVMODEW lpDevMode, + LPTSTR lpBuffer, + DWORD dwBufferLen) +{ + UINT uid = 0; + + switch (lpDevMode->dmBitsPerPel) + { + case 4: + uid = IDS_4BPP; + break; + case 8: + uid = IDS_8BPP; + break; + case 15: + uid = IDS_15BPP; + break; + case 16: + uid = IDS_16BPP; + break; + case 24: + uid = IDS_24BPP; + break; + case 32: + uid = IDS_32BPP; + break; + } + + if (uid == 0 || + !LoadString(hInstance, + uid, + lpBuffer, + dwBufferLen)) + { + lpBuffer[0] = TEXT('\0'); + } +} + +static VOID +GetRefreshRateDescription(PDEVMODEW lpDevMode, + LPTSTR lpBuffer, + DWORD dwBufferLen) +{ + TCHAR szFormat[64]; + + if (lpDevMode->dmDisplayFrequency <= 1) + { + if (!LoadString(hInstance, + IDS_DEFREFRESHRATE, + lpBuffer, + dwBufferLen)) + { + lpBuffer[0] = TEXT('\0'); + } + } + else + { + if (!LoadString(hInstance, + IDES_REFRESHRATEFMT, + szFormat, + sizeof(szFormat) / sizeof(szFormat[0]))) + { + szFormat[0] = TEXT('\0'); + } + + _sntprintf(lpBuffer, + dwBufferLen, + szFormat, + lpDevMode->dmDisplayFrequency); + } +} + +static VOID +InitListAllModesDialog(PDESKDISPLAYADAPTER This, + HWND hwndListAllModesDlg) +{ + TCHAR szFormat[64], szBuffer[64], szColors[64], szRefreshRate[64]; + PDEVMODEW lpDevMode; + DWORD dwIndex = 0; + INT i; + + if (This->DeskExtInterface != NULL) + { + if (!LoadString(hInstance, + IDS_MODEFMT, + szFormat, + sizeof(szFormat) / sizeof(szFormat[0]))) + { + szFormat[0] = TEXT('\0'); + } + + do + { + lpDevMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, + dwIndex++); + if (lpDevMode != NULL) + { + GetColorDescription(lpDevMode, + szColors, + sizeof(szColors) / sizeof(szColors[0])); + + GetRefreshRateDescription(lpDevMode, + szRefreshRate, + sizeof(szRefreshRate) / sizeof(szRefreshRate[0])); + + _sntprintf(szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]), + szFormat, + lpDevMode->dmPelsWidth, + lpDevMode->dmPelsHeight, + szColors, + szRefreshRate); + + i = (INT)SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES, + LB_ADDSTRING, + 0, + (LPARAM)szBuffer); + if (i >= 0) + { + SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES. + LB_SETITEMDATA, + (WPARAM)i, + (LPARAM)lpDevMode); + } + } + + } while (lpDevMode != NULL); + } +} + +static INT_PTR CALLBACK +ListAllModesDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDESKDISPLAYADAPTER This; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + { + This = (PDESKDISPLAYADAPTER)GetWindowLongPtr(hwndDlg, + DWL_USER); + } + + switch (uMsg) + { + case WM_INITDIALOG: + This = (PDESKDISPLAYADAPTER)lParam; + SetWindowLongPtr(hwndDlg, + DWL_USER, + (LONG_PTR)This); + + InitListAllModesDialog(This, + hwndDlg); + Ret = TRUE; + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + break; + case IDCANCEL: + EndDialog(hwndDlg, + IDCANCEL); + break; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, + IDCANCEL); + break; + } + + return Ret; +} + +static VOID +ShowListAllModes(PDESKDISPLAYADAPTER This) +{ + DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_LISTALLMODES), + This->hwndDlg, + ListAllModesDlgProc, + (LPARAM)This); +} static VOID ShowAdapterProperties(PDESKDISPLAYADAPTER This) @@ -106,6 +298,11 @@ case IDC_ADAPTERPROPERTIES: ShowAdapterProperties(This); break; + + case IDC_LISTALLMODES: + MessageBox(hwndDlg, _T("Bla"), NULL, 0); + ShowListAllModes(This); + break; } break; Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 03:10:41 2007 @@ -54,7 +54,7 @@ LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); -static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; +static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf9}}; ULONG __cdecl DbgPrint(PCCH Format,...); Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 03:10:41 2007 @@ -19,5 +19,30 @@ LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8 LTEXT "BIOS Information:", -1, 13, 116, 58, 8 LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8 + PUSHBUTTON "&List All Modes...", IDC_LISTALLMODES, 7, 139, 75, 14 END +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "List All Modes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15, WS_DISABLED + PUSHBUTTON "Cancel", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "List of valid modes", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Default Refresh" + IDES_REFRESHRATEFMT "%d Hertz" + IDS_4BPP "16 Colors" + IDS_8BPP "256 Colors" + IDS_15BPP "High Color (15 bit)" + IDS_16BPP "High Color (16 bit)" + IDS_24BPP "True Color (24 bit)" + IDS_32BPP "True Color (32 bit)" +END + Modified: trunk/reactos/dll/win32/shellext/deskadp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/precomp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/precomp.h Thu Sep 27 03:10:41 2007 @@ -4,6 +4,7 @@ #define COBJMACROS #include <windows.h> #include <tchar.h> +#include <stdio.h> #include <shlobj.h> #include <dll/desk/deskcplx.h> #include "deskadp.h" Modified: trunk/reactos/dll/win32/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/resource.h Thu Sep 27 03:10:41 2007 @@ -2,6 +2,7 @@ #define __RESOURCE__H #define IDD_DISPLAYADAPTER 100 +#define IDD_LISTALLMODES 101 #define IDC_ADAPTERNAME 201 #define IDC_ADAPTERPROPERTIES 202 @@ -10,5 +11,18 @@ #define IDC_MEMORYSIZE 205 #define IDC_ADAPTERSTRING 206 #define IDC_BIOSINFORMATION 207 +#define IDC_LISTALLMODES 208 + +#define IDC_ALLVALIDMODES 301 + +#define IDS_MODEFMT 101 +#define IDS_DEFREFRESHRATE 102 +#define IDES_REFRESHRATEFMT 103 +#define IDS_4BPP 104 +#define IDS_8BPP 105 +#define IDS_15BPP 106 +#define IDS_16BPP 107 +#define IDS_24BPP 108 +#define IDS_32BPP 109 #endif /* __RESOURCE__H */

1 0

[weiden] 29224: Display adapter information
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 01:19:54 2007 New Revision: 29224 URL: http://svn.reactos.org/svn/reactos?rev=29224&view=rev Log: Display adapter information Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskadp/resource.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 01:19:54 2007 @@ -51,6 +51,25 @@ LocalFree((HLOCAL)lpAdapterName); } + + if (This->DeskExtInterface != NULL) + { + SetDlgItemTextW(This->hwndDlg, + IDC_CHIPTYPE, + This->DeskExtInterface->ChipType); + SetDlgItemTextW(This->hwndDlg, + IDC_DACTYPE, + This->DeskExtInterface->DacType); + SetDlgItemTextW(This->hwndDlg, + IDC_MEMORYSIZE, + This->DeskExtInterface->MemorySize); + SetDlgItemTextW(This->hwndDlg, + IDC_ADAPTERSTRING, + This->DeskExtInterface->AdapterString); + SetDlgItemTextW(This->hwndDlg, + IDC_BIOSINFORMATION, + This->DeskExtInterface->BiosString); + } } static INT_PTR CALLBACK Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 01:19:54 2007 @@ -8,5 +8,16 @@ GROUPBOX "Adapter Type", -1, 7, 3, 237, 50 LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 + LTEXT "Chip Type:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8 + LTEXT "DAC Type:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8 + LTEXT "Memory Size:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8 + LTEXT "Adapter String:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8 + LTEXT "BIOS Information:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8 END Modified: trunk/reactos/dll/win32/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/resource.h Thu Sep 27 01:19:54 2007 @@ -4,6 +4,11 @@ #define IDD_DISPLAYADAPTER 100 #define IDC_ADAPTERNAME 201 -#define IDC_ADAPTERPROPERTIES 201 +#define IDC_ADAPTERPROPERTIES 202 +#define IDC_CHIPTYPE 203 +#define IDC_DACTYPE 204 +#define IDC_MEMORYSIZE 205 +#define IDC_ADAPTERSTRING 206 +#define IDC_BIOSINFORMATION 207 #endif /* __RESOURCE__H */

1 0

[fireball] 29223: - PS_UNKNOWN_VALUE determines if the process should be created with large pages: rename to PS_LARGE_PAGES - Do Address Space initialization as per "Windows Internals II" slides, either for the Boot, System, Cloned User or New User Process cases. - Rename MmCreateProcessAddressSpace to MmInitializeProcessAddressSpace, and MmCopyMmInfo to MmCreateProcessAddressSpace. What ReactOS did is correct as per "Windows Internals II", but the names were inverted. - Clone the Object Table i
by fireball＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: fireball Date: Thu Sep 27 00:55:26 2007 New Revision: 29223 URL: http://svn.reactos.org/svn/reactos?rev=29223&view=rev Log: - PS_UNKNOWN_VALUE determines if the process should be created with large pages: rename to PS_LARGE_PAGES - Do Address Space initialization as per "Windows Internals II" slides, either for the Boot, System, Cloned User or New User Process cases. - Rename MmCreateProcessAddressSpace to MmInitializeProcessAddressSpace, and MmCopyMmInfo to MmCreateProcessAddressSpace. What ReactOS did is correct as per "Windows Internals II", but the names were inverted. - Clone the Object Table if we are the boot process, and only initialize part of the address space (since we don't need things like guard page, TEB, etc), however, do initialize and map the shared user data section. - Make the initial system process and idle process share the same page directory instead of creating a new one. - Use the same priority class as the parent process, if the process was in the idle or below-normal priority class. - Only duplicate handles if the caller requested it, instead of always duplicating the process's handles! - Generate a null image file name for system processes. - Rename ObpCreateHandleTable to ObInitProcess and better handle race and out-of-memory conditions. Detect if auditing required, but don't do anything about it. - Initialize the Idle/System process address space much earlier in the boot process, in MmInitSystem. Thanks to Alex for providing various information, and answering all my questions. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Thu Sep 27 00:55:26 2007 @@ -85,11 +85,11 @@ #define PS_REQUEST_BREAKAWAY 1 #define PS_NO_DEBUG_INHERIT 2 #define PS_INHERIT_HANDLES 4 -#define PS_UNKNOWN_VALUE 8 +#define PS_LARGE_PAGES 8 #define PS_ALL_FLAGS (PS_REQUEST_BREAKAWAY | \ PS_NO_DEBUG_INHERIT | \ PS_INHERIT_HANDLES | \ - PS_UNKNOWN_VALUE) + PS_LARGE_PAGES) // // Process base priorities Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Sep 27 00:55:26 2007 @@ -612,9 +612,9 @@ NTSTATUS NTAPI -MmCreateProcessAddressSpace( +MmInitializeProcessAddressSpace( IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL, + IN PVOID Section OPTIONAL, IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL ); @@ -1189,12 +1189,26 @@ PVOID Address ); -NTSTATUS -NTAPI -MmCopyMmInfo( - struct _EPROCESS *Src, - struct _EPROCESS *Dest, - PPHYSICAL_ADDRESS DirectoryTableBase +BOOLEAN +NTAPI +MmCreateProcessAddressSpace( + IN ULONG MinWs, + IN PEPROCESS Dest, + IN PLARGE_INTEGER DirectoryTableBase +); + +NTSTATUS +NTAPI +MmInitializeHandBuiltProcess( + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase +); + + +NTSTATUS +NTAPI +MmInitializeHandBuiltProcess2( + IN PEPROCESS Process ); NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Sep 27 00:55:26 2007 @@ -191,8 +191,8 @@ // NTSTATUS NTAPI -ObpCreateHandleTable( - IN PEPROCESS Parent, +ObInitProcess( + IN PEPROCESS Parent OPTIONAL, IN PEPROCESS Process ); Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Thu Sep 27 00:55:26 2007 @@ -325,17 +325,33 @@ } NTSTATUS +NTAPI +MmInitializeHandBuiltProcess(IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + /* Share the directory base with the idle process */ + *DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase; + + /* Initialize the Addresss Space */ + MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot); + + /* The process now has an address space */ + Process->HasAddressSpace = TRUE; + return STATUS_SUCCESS; +} + +BOOLEAN STDCALL -MmCopyMmInfo(PEPROCESS Src, - PEPROCESS Dest, - PPHYSICAL_ADDRESS DirectoryTableBase) +MmCreateProcessAddressSpace(IN ULONG MinWs, + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) { NTSTATUS Status; ULONG i, j; PFN_TYPE Pfn[7]; ULONG Count; - DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest); + DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); Count = Ke386Pae ? 7 : 2; @@ -344,11 +360,12 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn[i]); if (!NT_SUCCESS(Status)) { - for (j = 0; j < i; j++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); - } - return Status; + for (j = 0; j < i; j++) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); + } + + return FALSE; } } @@ -400,7 +417,7 @@ DirectoryTableBase->QuadPart = PFN_TO_PTE(Pfn[0]); DPRINT("Finished MmCopyMmInfo(): %I64x\n", DirectoryTableBase->QuadPart); - return(STATUS_SUCCESS); + return TRUE; } VOID Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Sep 27 00:55:26 2007 @@ -432,6 +432,9 @@ /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); + /* Initialize the address space for the system process */ + MmInitializeProcessAddressSpace(PsGetCurrentProcess(), NULL, NULL); + /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock); Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Thu Sep 27 00:55:26 2007 @@ -471,10 +471,34 @@ } NTSTATUS -STDCALL -MmCreateProcessAddressSpace(IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL, - IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) +NTAPI +MmInitializeHandBuiltProcess2(IN PEPROCESS Process) +{ + PVOID BaseAddress; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + NTSTATUS Status; + PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + + /* Create the shared data page */ + BaseAddress = (PVOID)USER_SHARED_DATA; + Status = MmCreateMemoryArea(ProcessAddressSpace, + MEMORY_AREA_SHARED_DATA, + &BaseAddress, + PAGE_SIZE, + PAGE_EXECUTE_READ, + &MemoryArea, + FALSE, + 0, + BoundaryAddressMultiple); + return Status; +} + +NTSTATUS +NTAPI +MmInitializeProcessAddressSpace(IN PEPROCESS Process, + IN PVOID Section OPTIONAL, + IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; @@ -483,6 +507,7 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple; SIZE_T ViewSize = 0; PVOID ImageBase = 0; + PROS_SECTION_OBJECT SectionObject = Section; BoundaryAddressMultiple.QuadPart = 0; /* Initialize the Addresss Space */ @@ -546,7 +571,7 @@ Process->HasAddressSpace = TRUE; /* Check if there's a Section Object */ - if (Section) + if (SectionObject) { UNICODE_STRING FileName; PWCHAR szSrc; @@ -558,7 +583,7 @@ MmUnlockAddressSpace(ProcessAddressSpace); DPRINT("Mapping process image. Section: %p, Process: %p, ImageBase: %p\n", - Section, Process, &ImageBase); + SectionObject, Process, &ImageBase); Status = MmMapViewOfSection(Section, (PEPROCESS)Process, (PVOID*)&ImageBase, @@ -580,7 +605,7 @@ /* Determine the image file name and save it to EPROCESS */ DPRINT("Getting Image name\n"); - FileName = Section->FileObject->FileName; + FileName = SectionObject->FileObject->FileName; szSrc = (PWCHAR)(FileName.Buffer + FileName.Length); while (szSrc >= FileName.Buffer) { @@ -608,7 +633,7 @@ if (AuditName) { /* Setup the audit name */ - SeInitializeProcessAuditName(Section->FileObject, + SeInitializeProcessAuditName(SectionObject->FileObject, FALSE, AuditName); } Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Sep 27 00:55:26 2007 @@ -1956,40 +1956,57 @@ *--*/ NTSTATUS NTAPI -ObpCreateHandleTable(IN PEPROCESS Parent, - IN PEPROCESS Process) +ObInitProcess(IN PEPROCESS Parent OPTIONAL, + IN PEPROCESS Process) { - PHANDLE_TABLE HandleTable; - PAGED_CODE(); - - /* Check if we have a parent */ + PHANDLE_TABLE ParentTable, ObjectTable; + + /* Check for a parent */ if (Parent) { - /* Get the parent's table */ - HandleTable = ObReferenceProcessHandleTable(Parent); - if (!HandleTable) return STATUS_PROCESS_IS_TERMINATING; - - /* Duplicate the parent's */ - HandleTable = ExDupHandleTable(Process, - HandleTable, + /* Reference the parent's table */ + ParentTable = ObReferenceProcessHandleTable(Parent); + if (!ParentTable) return STATUS_PROCESS_IS_TERMINATING; + + /* Duplicate it */ + ObjectTable = ExDupHandleTable(Process, + ParentTable, ObpDuplicateHandleCallback, OBJ_INHERIT); } else { - /* Create a new one */ - HandleTable = ExCreateHandleTable(Process); - } - - /* Now write it */ - Process->ObjectTable = HandleTable; - - /* Dereference the parent's handle table if we have one */ - if (Parent) ObDereferenceProcessHandleTable(Parent); - - /* Fail or succeed depending on whether we got a handle table or not */ - if (!HandleTable) return STATUS_INSUFFICIENT_RESOURCES; - return STATUS_SUCCESS; + /* Otherwise just create a new table */ + ParentTable = NULL; + ObjectTable = ExCreateHandleTable(Process); + } + + /* Make sure we have a table */ + if (ObjectTable) + { + /* Associate it */ + Process->ObjectTable = ObjectTable; + + /* Check for auditing */ + if (SeDetailedAuditingWithToken(NULL)) + { + /* FIXME: TODO */ + DPRINT1("Need auditing!\n"); + } + + /* Get rid of the old table now */ + if (ParentTable) ObDereferenceProcessHandleTable(Parent); + + /* We are done */ + return STATUS_SUCCESS; + } + else + { + /* Fail */ + Process->ObjectTable = NULL; + if (ParentTable) ObDereferenceProcessHandleTable(Parent); + return STATUS_INSUFFICIENT_RESOURCES; + } } /*++ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Sep 27 00:55:26 2007 @@ -555,15 +555,28 @@ /* Set default exit code */ Process->ExitStatus = STATUS_TIMEOUT; - - /* Create or Clone the Handle Table */ - ObpCreateHandleTable(Parent, Process); - - /* Set Process's Directory Base */ - MmCopyMmInfo(Parent ? Parent : PsInitialSystemProcess, - Process, - &DirectoryTableBase); - + + /* Check if this is the initial process being built */ + if (Parent) + { + /* Create the address space for the child */ + if (!MmCreateProcessAddressSpace(MinWs, + Process, + &DirectoryTableBase)) + { + /* Failed */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto CleanupWithRef; + } + } + else + { + /* Otherwise, we are the boot process, we're already semi-initialized */ + Process->ObjectTable = CurrentProcess->ObjectTable; + Status = MmInitializeHandBuiltProcess(Process, &DirectoryTableBase); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + /* We now have an address space */ InterlockedOr((PLONG)&Process->Flags, PSF_HAS_ADDRESS_SPACE_BIT); @@ -583,14 +596,81 @@ /* Set default priority class */ Process->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; - - /* Create the Process' Address Space */ - Status = MmCreateProcessAddressSpace(Process, - (PROS_SECTION_OBJECT)SectionObject, - &Process->SeAuditProcessCreationInfo. - ImageFileName); - if (!NT_SUCCESS(Status)) goto CleanupWithRef; - + + /* Check if we have a parent */ + if (Parent) + { + /* Check our priority class */ + if (Parent->PriorityClass == PROCESS_PRIORITY_CLASS_IDLE || + Parent->PriorityClass == PROCESS_PRIORITY_CLASS_BELOW_NORMAL) + { + /* Normalize it */ + Process->PriorityClass = Parent->PriorityClass; + } + + /* Initialize object manager for the process */ + Status = ObInitProcess(Flags & PS_INHERIT_HANDLES ? Parent : NULL, + Process); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + else + { + /* Do the second part of the boot process memory setup */ + Status = MmInitializeHandBuiltProcess2(Process); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + + /* Set success for now */ + Status = STATUS_SUCCESS; + + /* Check if this is a real user-mode process */ + if (SectionHandle) + { + /* Initialize the address space */ + Status = MmInitializeProcessAddressSpace(Process, + SectionObject, + &Process-> + SeAuditProcessCreationInfo. + ImageFileName); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + else if (Parent) + { + /* Check if this is a child of the system process */ + if (Parent != PsInitialSystemProcess) + { + /* This is a clone! */ + ASSERTMSG("No support for cloning yet\n", FALSE); + } + else + { + /* This is a system process other than the boot one (MmInit1) */ + Flags &= ~PS_LARGE_PAGES; + Status = MmInitializeProcessAddressSpace(Process, + NULL, + &Process-> + SeAuditProcessCreationInfo. + ImageFileName); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + + /* Create a dummy image file name */ + Process->SeAuditProcessCreationInfo.ImageFileName = + ExAllocatePoolWithTag(PagedPool, + sizeof(OBJECT_NAME_INFORMATION), + TAG('S', 'e', 'P', 'a')); + if (!Process->SeAuditProcessCreationInfo.ImageFileName) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto CleanupWithRef; + } + + /* Zero it out */ + RtlZeroMemory(Process->SeAuditProcessCreationInfo.ImageFileName, + sizeof(OBJECT_NAME_INFORMATION)); + } + } + /* Check if we have a section object and map the system DLL */ if (SectionObject) PspMapSystemDll(Process, NULL, FALSE);

1 0

[dreimer] 29222: Another german rc file update
by dreimer＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: dreimer Date: Thu Sep 27 00:49:06 2007 New Revision: 29222 URL: http://svn.reactos.org/svn/reactos?rev=29222&view=rev Log: Another german rc file update Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc Thu Sep 27 00:49:06 2007 @@ -122,13 +122,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Property sheet kann nicht erstellt werden" IDS_OUT_OF_MEMORY "Nicht genug Arbeitsspeicher" IDS_CANNOT_SAVE_CHANGES "Änderungen können nicht gespeichert werden" - IDS_STATUS_NON_OPERATIONAL "Non-operational" - IDS_STATUS_UNREACHABLE "No WAN adapter found" - IDS_STATUS_DISCONNECTED "Disconnected" - IDS_STATUS_CONNECTING "Connecting" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_STATUS_NON_OPERATIONAL "Nicht operational" + IDS_STATUS_UNREACHABLE "Kein WAN Adapter gefunden" + IDS_STATUS_DISCONNECTED "Nicht Verbunden" + IDS_STATUS_CONNECTING "Verbinde" + IDS_STATUS_CONNECTED "Verbunden" + IDS_STATUS_OPERATIONAL "Verbunden" IDS_SPEED_MBPS "%d Mbps" - IDS_DURATION_DAY "%d day %s" - IDS_DURATION_DAYS "%d days %s" + IDS_DURATION_DAY "%d Tag %s" + IDS_DURATION_DAYS "%d Tage %s" END

1 0

[weiden] 29221: Display the display device adapter name and show device properties
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 00:41:57 2007 New Revision: 29221 URL: http://svn.reactos.org/svn/reactos?rev=29221&view=rev Log: Display the display device adapter name and show device properties Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c trunk/reactos/dll/win32/shellext/deskadp/deskadp.h trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskadp/precomp.h trunk/reactos/dll/win32/shellext/deskadp/resource.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 00:41:57 2007 @@ -4,6 +4,54 @@ #include <debug.h> static HINSTANCE hInstance; + +typedef INT_PTR (WINAPI *PDEVICEPROPERTIESEXW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL); + +static VOID +ShowAdapterProperties(PDESKDISPLAYADAPTER This) +{ + HMODULE hDevMgr; + PDEVICEPROPERTIESEXW pDevicePropertiesExW; + + hDevMgr = LoadLibrary(TEXT("devmgr.dll")); + if (hDevMgr != NULL) + { + pDevicePropertiesExW = (PDEVICEPROPERTIESEXW)GetProcAddress(hDevMgr, + "DevicePropertiesExW"); + if (pDevicePropertiesExW != NULL) + { + pDevicePropertiesExW(This->hwndDlg, + NULL, + This->lpDeviceId, + 0, + FALSE); + } + + FreeLibrary(hDevMgr); + } +} + +static VOID +InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This) +{ + LPTSTR lpAdapterName; + + This->lpDeviceId = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_DISPLAYID)); + EnableWindow(GetDlgItem(This->hwndDlg, + IDC_ADAPTERPROPERTIES), + This->lpDeviceId != NULL && This->lpDeviceId[0] != TEXT('\0')); + lpAdapterName = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_DISPLAYNAME)); + if (lpAdapterName != NULL) + { + SetDlgItemText(This->hwndDlg, + IDC_ADAPTERNAME, + lpAdapterName); + + LocalFree((HLOCAL)lpAdapterName); + } +} static INT_PTR CALLBACK DisplayAdapterDlgProc(HWND hwndDlg, @@ -24,12 +72,24 @@ { case WM_INITDIALOG: This = (PDESKDISPLAYADAPTER)((LPCPROPSHEETPAGE)lParam)->lParam; + This->hwndDlg = hwndDlg; SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)This); + InitDisplayAdapterDialog(This); Ret = TRUE; break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_ADAPTERPROPERTIES: + ShowAdapterProperties(This); + break; + } + + break; } return Ret; @@ -48,6 +108,12 @@ { LocalFree((HLOCAL)This->DeskExtInterface); This->DeskExtInterface = NULL; + } + + if (This->lpDeviceId != NULL) + { + LocalFree((HLOCAL)This->lpDeviceId); + This->lpDeviceId = NULL; } } Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 00:41:57 2007 @@ -8,8 +8,10 @@ const struct IClassFactoryVtbl *lpIClassFactoryVtbl; DWORD ref; + HWND hwndDlg; PDESK_EXT_INTERFACE DeskExtInterface; IDataObject *pdtobj; + LPTSTR lpDeviceId; } DESKDISPLAYADAPTER, *PDESKDISPLAYADAPTER; extern LONG dll_refs; Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 00:41:57 2007 @@ -5,6 +5,8 @@ CAPTION "Adapter" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - + GROUPBOX "Adapter Type", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 + PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 END Modified: trunk/reactos/dll/win32/shellext/deskadp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/precomp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/precomp.h Thu Sep 27 00:41:57 2007 @@ -3,6 +3,7 @@ #define COBJMACROS #include <windows.h> +#include <tchar.h> #include <shlobj.h> #include <dll/desk/deskcplx.h> #include "deskadp.h" Modified: trunk/reactos/dll/win32/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/resource.h Thu Sep 27 00:41:57 2007 @@ -3,4 +3,7 @@ #define IDD_DISPLAYADAPTER 100 +#define IDC_ADAPTERNAME 201 +#define IDC_ADAPTERPROPERTIES 201 + #endif /* __RESOURCE__H */

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007