Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[rharabien] 54927: [SHELL32] - Add "Description" string to resources. Don't show application file extension in Description field (for applications without version info). Patch by Edijs Kolesnikovis...
by rharabien＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: rharabien Date: Thu Jan 12 21:43:46 2012 New Revision: 54927 URL: http://svn.reactos.org/svn/reactos?rev=54927&view=rev Log: [SHELL32] - Add "Description" string to resources. Don't show application file extension in Description field (for applications without version info). Patch by Edijs Kolesnikovis (#6819) - Implement associated application icon loading in File Properties dialog - Implement "Change" button in File Properties dialog Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp trunk/reactos/dll/win32/shell32/filedefext.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/openwithmenu.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -219,7 +219,7 @@ INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 10)/2; INT cx = pDrawItem->rcItem.right - pDrawItem->rcItem.left; INT cy = pDrawItem->rcItem.bottom - pDrawItem->rcItem.top - 10; - TRACE("cFreeSpace %d a %f cx %d\n", cFreeSpace, M_PI+cFreeSpace/100.0f*M_PI*2.0f, cx); + TRACE("FreeSpace %u a %f cx %d\n", cFreeSpace, M_PI+cFreeSpace/100.0f*M_PI*2.0f, cx); HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush); INT xRadial = xCenter + (INT)(cosf(M_PI+cFreeSpace/100.0f*M_PI*2.0f)*cx/2); Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -290,6 +290,26 @@ PathRemoveArgs(wszBuf); PathUnquoteSpacesW(wszBuf); PathSearchAndQualify(wszBuf, wszPath, _countof(wszPath)); + + HICON hIcon; + if (ExtractIconExW(wszPath, 0, NULL, &hIcon, 1)) + { + HWND hIconCtrl = GetDlgItem(hwndDlg, 14025); + HWND hDescrCtrl = GetDlgItem(hwndDlg, 14007); + ShowWindow(hIconCtrl, SW_SHOW); + RECT rcIcon, rcDescr; + GetWindowRect(hIconCtrl, &rcIcon); + MapWindowPoints(NULL, hwndDlg, (LPPOINT)&rcIcon, 2); + GetWindowRect(hDescrCtrl, &rcDescr); + MapWindowPoints(NULL, hwndDlg, (LPPOINT)&rcDescr, 2); + INT cxOffset = rcIcon.right + 2 - rcDescr.left; + SetWindowPos(hDescrCtrl, NULL, + rcDescr.left + cxOffset, rcDescr.top, + rcDescr.right - rcDescr.left - cxOffset, rcDescr.bottom - rcDescr.top, + SWP_NOZORDER); + SendMessageW(hIconCtrl, STM_SETICON, (WPARAM)hIcon, 0); + } else + ERR("Failed to extract icon\n"); if (PathFileExistsW(wszPath)) { @@ -529,13 +549,19 @@ InitOpensWithField(hwndDlg); else { - SetDlgItemTextW(hwndDlg, 14006, L"Description:"); // FIXME - ShowWindow(GetDlgItem(hwndDlg, 140062), SW_HIDE); + WCHAR wszBuf[MAX_PATH]; + LoadStringW(shell32_hInstance, IDS_EXE_DESCRIPTION, wszBuf, _countof(wszBuf)); + SetDlgItemTextW(hwndDlg, 14006, wszBuf); + ShowWindow(GetDlgItem(hwndDlg, 14024), SW_HIDE); LPCWSTR pwszDescr = m_VerInfo.GetString(L"FileDescription"); if (pwszDescr) SetDlgItemTextW(hwndDlg, 14007, pwszDescr); else - SetDlgItemTextW(hwndDlg, 14007, PathFindFileNameW(m_wszPath)); + { + StringCbCopyW(wszBuf, sizeof(wszBuf), PathFindFileNameW(m_wszPath)); + PathRemoveExtension(wszBuf); + SetDlgItemTextW(hwndDlg, 14007, wszBuf); + } } /* Set file created/modfied/accessed time */ @@ -567,8 +593,21 @@ TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n", hwndDlg, lParam, ppsp->lParam); CFileDefExt *pFileDefExt = (CFileDefExt*)ppsp->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pFileDefExt); pFileDefExt->InitGeneralPage(hwndDlg); + break; } + case WM_COMMAND: + if (LOWORD(wParam) == 14024) /* Opens With - Change */ + { + CFileDefExt *pFileDefExt = (CFileDefExt*)GetWindowLongPtr(hwndDlg, DWLP_USER); + OPENASINFO oainfo; + oainfo.pcszFile = pFileDefExt->m_wszPath; + oainfo.pcszClass = NULL; + oainfo.oaifInFlags = OAIF_REGISTER_EXT|OAIF_FORCE_REGISTRATION; + return SUCCEEDED(SHOpenWithDialog(hwndDlg, &oainfo)); + } + break; default: break; } Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "ÐÐ¸Ð´ ÑÐ°Ð¹Ð»:", 14004, 8, 35, 50, 10 LTEXT "Ð¤Ð°Ð¹Ð»", 14005, 68, 35, 160, 10 LTEXT "ÐÑÐ²Ð°ÑÑÐ½Ðµ Ñ:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "ÐÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ:", 14008, 8, 72, 61, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", 14010, 8, 93, 45, 10 @@ -378,8 +378,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&ÐÐ¸Ð½Ð°Ð³Ð¸ Ð¸Ð·Ð±ÑÐ°Ð½Ð¾ÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð° Ð¾ÑÐ²Ð°ÑÑ ÑÐ¾Ð·Ð¸ Ð²Ð¸Ð´ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ.", 14003, 20, 193, 225, 10 PUSHBUTTON "&ÐÐ±Ð·Ð¾Ñ...", 14004, 198, 207, 50, 14 - PUSHBUTTON "ÐÐ¾Ð±ÑÐµ", 14005, 150, 236, 50, 14 - PUSHBUTTON "ÐÑÐºÐ°Ð·", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 150, 236, 50, 14 + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -776,8 +776,9 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END - - - - + IDS_EXE_DESCRIPTION "Description:" +END + + + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -224,9 +224,9 @@ LTEXT "Typ souboru:", 14004, 8, 35, 50, 10 LTEXT "Soubor", 14005, 68, 35, 160, 10 LTEXT "OtevÃrat v:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "UmÃstÄnÃ:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Velikost:", 14010, 8, 93, 45, 10 @@ -367,8 +367,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&VÅ¾dy pouÅ¾Ãt vybranÃ½ program k otevÅenÃ tohoto typu souboru", 14003, 20, 193, 225, 10 PUSHBUTTON "P&rochÃ¡zet...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Storno", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -763,4 +763,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -225,9 +225,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -368,8 +368,8 @@ LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -764,4 +764,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -239,9 +239,9 @@ LTEXT "Dateityp:", 14004, 8, 35, 50, 10 LTEXT "Datei", 14005, 68, 35, 160, 10 LTEXT "Ãffnen mit:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Pfad:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "GrÃ¶Ãe:", 14010, 8, 93, 45, 10 @@ -382,8 +382,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Dateityp &immer mit dem ausgewÃ¤hlten Programm Ã¶ffnen", 14003, 20, 193, 225, 10 PUSHBUTTON "&Durchsuchen...", 14004, 188, 207, 60, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Abbrechen", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -780,4 +780,5 @@ IDS_COLUMN_EXTENSION "Erweiterungen" IDS_BYTES_FORMAT "Bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Î¤ÏÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï:", 14004, 10, 30, 50, 10 LTEXT "ÎÏÏÎµÎ¯Î¿", 14005, 70, 30, 150, 10 LTEXT "ÎÎ½Î¿Î¯Î³ÎµÎ¹ Î¼Îµ:", 14006, 10, 40, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "ÎÎÏÎ·:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "ÎÎÎ³ÎµÎ¸Î¿Ï:",14010, 10, 65, 45, 10 @@ -377,8 +377,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 CHECKBOX "&ÎÎ½Î¿Î¹Î³Î¼Î± Î±ÏÏÎ¿Ï ÏÎ¿Ï ÎµÎ¯Î´Î¿ÏÏ Î±ÏÏÎµÎ¯Î¿Ï, ÏÎ¬Î½ÏÎ± Î¼Îµ ÏÎ¿ ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î±", 14003, 20, 193, 225, 10 PUSHBUTTON "&ÎÎ½Î±Î¶Î®ÏÎ·ÏÎ·...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "ÎÎºÏÏÎ¿", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "ÎÎºÏÏÎ¿", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -774,4 +774,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,12 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - - //ID, left, top, width, height - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL - + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY| NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -382,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END IDD_SH_FILE_COPY DIALOGEX 0, 0, 264, 45 @@ -788,4 +785,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -239,9 +239,9 @@ LTEXT "Tipo de archivo:", 14004, 8, 35, 55, 10 LTEXT "Archivo", 14005, 68, 35, 160, 10 LTEXT "Se abre con:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "UbicaciÃ³n:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "TamaÃ±o:", 14010, 8, 93, 45, 10 @@ -382,8 +382,8 @@ LISTBOX 14002, 16 ,57, 250, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE AUTOCHECKBOX "Utilizar &siempre el programa seleccionado para abrir este tipo de archivos", 14003, 15, 193, 250, 10 PUSHBUTTON "&Examinar...", 14004, 218, 207, 50, 14 - PUSHBUTTON "Aceptar", 14005, 170, 236, 50, 14 - PUSHBUTTON "Cancelar", 14006, 226, 236, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 170, 236, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 226, 236, 50, 14 END IDD_SH_FILE_COPY DIALOGEX 0, 0, 264, 45 @@ -788,4 +788,5 @@ IDS_COLUMN_EXTENSION "Extensiones" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -240,9 +240,9 @@ LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 LTEXT "Fichier", 14005, 68, 35, 160, 10 LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Localisation :", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Taille :", 14010, 8, 93, 45, 10 @@ -383,8 +383,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "Toujours utiliser le progr&amme sÃ©lectionnÃ© pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10 PUSHBUTTON "Parcourir...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Annuler", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -779,4 +779,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -239,9 +239,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -382,8 +382,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -778,4 +778,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -237,9 +237,9 @@ LTEXT "Tipo di file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Apri con:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Posizione:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Dimensione:", 14010, 8, 93, 45, 10 @@ -380,8 +380,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Usare sempre il programma selezionato per aprire questo tipo di file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Sfoglia...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Annulla", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 206, 236, 50, 14 END IDD_SH_FILE_COPY DIALOGEX 0, 0, 264, 45 @@ -786,4 +786,5 @@ IDS_COLUMN_EXTENSION "Estensioni" IDS_BYTES_FORMAT "byte" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "ãã¡ã¤ã«ã®ç¨®é¡:", 14004, 8, 35, 50, 10 LTEXT "ãã¡ã»Cã«", 14005, 68, 35, 160, 10 LTEXT "å®è¡ããã°ã©ã :", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "å ´æ:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "ãµã¤ãº:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "ãã®ç¨®é¡ã®ãã¡ã¤ã«ãéãã¨ãã¯ãå¸¸ã«é¸æããããã°ã©ã ãä½¿ç¨ãã(&A)", 14003, 20, 193, 225, 10 PUSHBUTTON "åç§(&B)...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "ãã£ã³ã»ã«", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -237,9 +237,9 @@ LTEXT "Filtype:", 14004, 8, 35, 50, 10 LTEXT "Fil", 14005, 68, 35, 160, 10 LTEXT "Ãpne med:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Lokalisjon:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "StÃ¸rrelse:", 14010, 8, 93, 45, 10 @@ -380,8 +380,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Alltid bruk valgte program for Ã¥ Ã¥pne denne filtypen", 14003, 20, 193, 225, 10 PUSHBUTTON "&Utforsk...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Avbryt", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -778,4 +778,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -244,9 +244,9 @@ LTEXT "Typ pliku:", 14004, 8, 35, 50, 10 LTEXT "Plik", 14005, 68, 35, 160, 10 LTEXT "Otwierany za pomocÄ:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "ZmieÅ...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "ZmieÅ...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Lokalizacja:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Rozmiar:", 14010, 8, 93, 45, 10 @@ -387,8 +387,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Zawsze uÅ¼ywaj danego programu do otwierania tego typu plikÃ³w", 14003, 20, 193, 225, 10 PUSHBUTTON "&PrzeglÄdaj...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Anuluj", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -783,4 +783,5 @@ IDS_COLUMN_EXTENSION "Rozszerzenia" IDS_BYTES_FORMAT "bajtÃ³w" IDS_UNKNOWN_APP "Nieznana aplikacja" -END + IDS_EXE_DESCRIPTION "Opis:" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -238,9 +238,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -381,8 +381,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -777,4 +777,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -239,9 +239,9 @@ LTEXT "Tipo de Ficheiro:", 14004, 8, 35, 50, 10 LTEXT "Ficheiro", 14005, 68, 35, 160, 10 LTEXT "Abre com::", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "LocalizaÃ§Ã£o:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Tamanho:", 14010, 8, 93, 45, 10 @@ -382,8 +382,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Utilizar sempre o programa seleccionado para abrir este tipo de ficheiros", 14003, 20, 193, 225, 10 PUSHBUTTON "&Seleccione...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancelar", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -778,4 +778,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -239,9 +239,9 @@ LTEXT "Tip fiÈier:", 14004, 8, 35, 50, 10 LTEXT "FiÈier", 14005, 68, 35, 160, 10 LTEXT "Se deschide cu:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "LocaÈie:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "MÄrime:", 14010, 8, 93, 45, 10 @@ -380,8 +380,8 @@ LISTBOX 14002, 16 ,57, 235, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE AUTOCHECKBOX "&UtilizeazÄ Ã®ntotdeauna aceastÄ aplicaÈie", 14003, 20, 198, 225, 10 PUSHBUTTON "&RÄsfoireâ¦", 14004, 198, 207, 50, 14 - PUSHBUTTON "Con&firmÄ", 14005, 150, 236, 50, 14 - PUSHBUTTON "A&nuleazÄ", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 150, 236, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 206, 236, 50, 14 END IDD_SH_FILE_COPY DIALOGEX 0, 0, 264, 45 @@ -792,5 +792,6 @@ IDS_COLUMN_EXTENSION "Extensii" IDS_BYTES_FORMAT "octeÈi" IDS_UNKNOWN_APP "Unknown application" -END - + IDS_EXE_DESCRIPTION "Description:" +END + Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ð°:", 14004, 8, 35, 50, 10 LTEXT "ÑÐ°Ð¹Ð»", 14005, 68, 35, 160, 10 LTEXT "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Ð Ð°Ð·Ð¼ÐµÑÐµÐ½Ð¸Ðµ:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", 14010, 8, 93, 45, 10 @@ -378,8 +378,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÐµÐµ Ð´Ð»Ñ Ð²ÑÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð² ÑÐ°ÐºÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ð°", 14003, 20, 193, 225, 10 PUSHBUTTON "&ÐÐ±Ð·Ð¾Ñ...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 238 @@ -773,4 +773,5 @@ IDS_COLUMN_EXTENSION "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -242,9 +242,9 @@ LTEXT "Typ sÃºboru:", 14004, 8, 35, 50, 10 LTEXT "SÃºbor", 14005, 68, 35, 160, 10 LTEXT "OtvoriÅ¥ programom:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Umiestnenie:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "VeÄ¾kosÅ¥:", 14010, 8, 93, 45, 10 @@ -385,8 +385,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "N&a otvorenie tÃ½chto sÃºborov vÅ¾dy pouÅ¾iÅ¥ vybratÃ½ program", 14003, 20, 193, 225, 10 PUSHBUTTON "&PrehÄ¾adÃ¡vaÅ¥...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "ZruÅ¡iÅ¥", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -783,4 +783,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,4 +775,5 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -238,9 +238,9 @@ LTEXT "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ñ:", 14004, 8, 35, 50, 10 LTEXT "Ð¤Ð°Ð¹Ð»", 14005, 68, 35, 160, 10 LTEXT "ÐÐ¾Ð´Ð°ÑÐ¾Ðº:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Ð Ð¾Ð·ÑÐ°ÑÑÐ²Ð°Ð½Ð½Ñ:", 14008, 8, 72, 50, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Ð Ð¾Ð·Ð¼ÑÑ:", 14010, 8, 93, 45, 10 @@ -381,8 +381,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "ÐÐ°Ð²Ð¶Ð´&Ð¸ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð´Ð»Ñ ÑÐ°Ð¹Ð»ÑÐ² ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ñ", 14003, 20, 193, 225, 10 PUSHBUTTON "Ð&Ð³Ð»ÑÐ´...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 206, 236, 50, 14 END IDD_SH_FILE_COPY DIALOGEX 0, 0, 264, 45 @@ -788,4 +788,5 @@ IDS_COLUMN_EXTENSION "Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END + IDS_EXE_DESCRIPTION "Description:" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -225,9 +225,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -368,8 +368,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - PUSHBUTTON "ç¡®å®", 14005, 150, 236, 50, 14 - PUSHBUTTON "åæ¶", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "ç¡®å®", IDOK, 150, 236, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -763,5 +763,6 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END - + IDS_EXE_DESCRIPTION "Description:" +END + Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -236,9 +236,9 @@ LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 LTEXT "Opens with:", 14006, 8, 53, 50, 10 - ICON "", 140061, 63, 52, 11, 10, WS_VISIBLE - PUSHBUTTON "Change...", 140062, 158, 50, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 77, 53, 77, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL + ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE + PUSHBUTTON "Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Location:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL LTEXT "Size:", 14010, 8, 93, 45, 10 @@ -379,8 +379,8 @@ CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - DEFPUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -775,5 +775,6 @@ IDS_COLUMN_EXTENSION "Extensions" IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" -END - + IDS_EXE_DESCRIPTION "Description:" +END + Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -1003,12 +1003,12 @@ pThis->Browse(); return TRUE; } - case 14005: /* ok */ + case IDOK: /* ok */ { pThis->Accept(); return TRUE; } - case 14006: /* cancel */ + case IDCANCEL: /* cancel */ DestroyWindow(hwndDlg); return TRUE; default: @@ -1019,7 +1019,7 @@ switch (((LPNMHDR)lParam)->code) { case TVN_SELCHANGED: - EnableWindow(GetDlgItem(hwndDlg, 14005), pThis->GetCurrentApp() ? TRUE : FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDOK), pThis->GetCurrentApp() ? TRUE : FALSE); break; case NM_DBLCLK: case NM_RETURN: Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Jan 12 21:43:46 2012 @@ -146,6 +146,7 @@ #define IDS_RUNDLG_BROWSE_FILTER 183 #define IDS_UNKNOWN_APP 190 +#define IDS_EXE_DESCRIPTION 191 #define IDS_OPEN_VERB 300 #define IDS_EXPLORE_VERB 301

1 0

[rharabien] 54926: [SHELL32] - Show drive icon in properties dialog - Show nice pie chart for space usage
by rharabien＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: rharabien Date: Thu Jan 12 20:10:35 2012 New Revision: 54926 URL: http://svn.reactos.org/svn/reactos?rev=54926&view=rev Log: [SHELL32] - Show drive icon in properties dialog - Show nice pie chart for space usage Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _USE_MATH_DEFINES #include <precomp.h> +#include <math.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -204,30 +206,55 @@ } else if (pDrawItem->CtlID == 14015) { - HBRUSH hBlueBrush; - HBRUSH hMagBrush; - RECT rect; - LONG horzsize; - LONGLONG Result; - WCHAR szBuffer[20]; - - hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); - hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); - - GetDlgItemTextW(hwndDlg, 14006, szBuffer, 20); - Result = _wtoi(szBuffer); - - CopyRect(&rect, &pDrawItem->rcItem); - horzsize = rect.right - rect.left; - Result = (Result * horzsize) / 100; - - rect.right = pDrawItem->rcItem.right - Result; - FillRect(pDrawItem->hDC, &rect, hBlueBrush); - rect.left = rect.right; - rect.right = pDrawItem->rcItem.right; - FillRect(pDrawItem->hDC, &rect, hMagBrush); + HBRUSH hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); + HBRUSH hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); + HPEN hDarkBluePen = CreatePen(PS_SOLID, 1, RGB(0, 0, 128)); + HPEN hDarkMagPen = CreatePen(PS_SOLID, 1, RGB(128, 0, 128)); + + WCHAR wszBuf[20]; + GetDlgItemTextW(hwndDlg, 14006, wszBuf, _countof(wszBuf)); + UINT cFreeSpace = _wtoi(wszBuf); + + INT xCenter = (pDrawItem->rcItem.left + pDrawItem->rcItem.right)/2; + INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 10)/2; + INT cx = pDrawItem->rcItem.right - pDrawItem->rcItem.left; + INT cy = pDrawItem->rcItem.bottom - pDrawItem->rcItem.top - 10; + TRACE("cFreeSpace %d a %f cx %d\n", cFreeSpace, M_PI+cFreeSpace/100.0f*M_PI*2.0f, cx); + + HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush); + INT xRadial = xCenter + (INT)(cosf(M_PI+cFreeSpace/100.0f*M_PI*2.0f)*cx/2); + INT yRadial = yCenter - (INT)(sinf(M_PI+cFreeSpace/100.0f*M_PI*2.0f)*cy/2); + Pie(pDrawItem->hDC, + pDrawItem->rcItem.left, pDrawItem->rcItem.top, + pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10, + pDrawItem->rcItem.left, yCenter, + xRadial, yRadial); + + SelectObject(pDrawItem->hDC, hBlueBrush); + Pie(pDrawItem->hDC, + pDrawItem->rcItem.left, pDrawItem->rcItem.top, + pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10, + xRadial, yRadial, + pDrawItem->rcItem.left, yCenter); + SelectObject(pDrawItem->hDC, hbrOld); + + HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkBluePen); + for (INT x = pDrawItem->rcItem.left; x < pDrawItem->rcItem.right; ++x) + { + if (cFreeSpace < 50 && x == xRadial) + SelectObject(pDrawItem->hDC, hDarkMagPen); + + float cos_val = (x - xCenter)*2.0f/cx; + INT y = yCenter+sinf(acosf(cos_val))*cy/2; + MoveToEx(pDrawItem->hDC, x, y, NULL); + LineTo(pDrawItem->hDC, x, y + 10); + } + SelectObject(pDrawItem->hDC, hOldPen); + DeleteObject(hBlueBrush); DeleteObject(hMagBrush); + DeleteObject(hDarkBluePen); + DeleteObject(hDarkMagPen); } } @@ -298,11 +325,24 @@ } } } - /* set drive description */ + + /* Set drive description */ WCHAR wszFormat[50]; GetDlgItemTextW(hwndDlg, 14009, wszFormat, _countof(wszFormat)); - swprintf(wszBuf, wszFormat, m_wszDrive); + swprintf(wszBuf, wszFormat, m_wszDrive[0]); SetDlgItemTextW(hwndDlg, 14009, wszBuf); + + /* Set drive icon */ + UINT IconId; + switch (DriveType) + { + case DRIVE_CDROM: IconId = IDI_SHELL_CDROM; break; + case DRIVE_REMOVABLE: IconId = IDI_SHELL_FLOPPY; break; + case DRIVE_RAMDISK: IconId = IDI_SHELL_RAMDISK; break; + default: IconId = IDI_SHELL_DRIVE; + } + HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IconId), IMAGE_ICON, 32, 32, LR_SHARED); + SendDlgItemMessageW(hwndDlg, 14016, STM_SETICON, (WPARAM)hIcon, 0); } INT_PTR CALLBACK @@ -336,7 +376,8 @@ } break; } - + case WM_PAINT: + break; case WM_COMMAND: if (LOWORD(wParam) == 14010) /* Disk Cleanup */ { Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "ÐÐ±ÑÐ¸" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "ÐÐ¸Ð´ Ð½Ð° ÑÐ°Ð¹Ð»Ð°:", 14004, 8, 35, 50, 10 LTEXT "ÐÐ°Ð¿ÐºÐ°", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "ÐÐ±ÑÐ¸" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "ÐÐ¸Ð´ ÑÐ°Ð¹Ð»:", 14004, 8, 35, 50, 10 LTEXT "Ð¤Ð°Ð¹Ð»", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "ÐÐ±ÑÐ¸" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "ÐÐ¸Ð´:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ %c", 14009, 100, 170, 40, 10 PUSHBUTTON "ÐÐ¾ÑÐ¸ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð´Ð¸ÑÐºÐ°", 14010, 150, 175, 80, 15, WS_TABSTOP CHECKBOX "Ð£Ð¿Ð»ÑÑÐ½ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ð·Ð° ÑÐ¿ÐµÑÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¼ÑÑÑÐ¾", 14011, 1, 205, 238, 10, WS_DISABLED CHECKBOX "ÐÐ½Ð´ÐµÐºÑÐ¸ÑÐ°ÑÐ°ÑÐ° ÑÑÐ»ÑÐ³Ð° Ð´Ð° Ð¸Ð½Ð´ÐµÐºÑÐ¸ÑÐ° Ð´Ð¸ÑÐºÐ° Ð·Ð° Ð¿Ð¾- Ð±ÑÑÐ·Ð¾ ÑÑÑÑÐµÐ½Ðµ", 14012, 1, 220, 238, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -198,7 +198,7 @@ CAPTION "ObecnÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Typ souboru:", 14004, 8, 35, 50, 10 LTEXT "SloÅ¾ka", 14005, 68, 35, 160, 10 @@ -219,7 +219,7 @@ CAPTION "ObecnÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Typ souboru:", 14004, 8, 35, 50, 10 LTEXT "Soubor", 14005, 68, 35, 160, 10 @@ -266,7 +266,9 @@ CAPTION "ObecnÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Typ:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -287,9 +289,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Disk %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Disk %c", 14009, 100, 170, 40, 10 PUSHBUTTON "VyÄiÅ¡tÄnÃ disku", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Å etÅit mÃsto na disku jeho kompresÃ", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Povolit indexovÃ¡nÃ disku pro rychlejÅ¡Ã vyhledÃ¡vÃ¡nÃ", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -198,7 +198,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -220,7 +220,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -267,7 +267,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -288,9 +290,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -212,7 +212,7 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Typ:", 14004, 8, 35, 50, 10 LTEXT "Dateiordner", 14005, 68, 35, 160, 10 @@ -234,7 +234,7 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Dateityp:", 14004, 8, 35, 50, 10 LTEXT "Datei", 14005, 68, 35, 160, 10 @@ -281,7 +281,9 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Typ:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -302,9 +304,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Laufwerk %s", 14009, 100, 170, 50, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Laufwerk %c", 14009, 100, 170, 50, 10 PUSHBUTTON "Bereinigen", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Laufwerk fÃ¼r schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "ÎÎµÎ½Î¹ÎºÎ¬" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -299,9 +299,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "ÎÎ¯ÏÎºÎ¿Ï %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "ÎÎ¯ÏÎºÎ¿Ï %c", 14009, 100, 170, 40, 10 PUSHBUTTON "ÎÎºÎºÎ±Î¸Î¬ÏÎ¹ÏÎ· Î´Î¯ÏÎºÎ¿Ï", 14010, 160, 175, 70, 15, WS_TABSTOP CHECKBOX "Î£ÏÎ¼ÏÎ¯ÎµÏÎ· Î´Î¯ÏÎºÎ¿Ï Î³Î¹Î± ÎµÎ¾Î¿Î¹ÎºÎ¿Î½ÏÎ¼Î·ÏÎ· ÏÏÏÎ¿Ï", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÎµÏÏÎµÏÎ·ÏÎ¯Î¿Ï Î³Î¹Î± Î³ÏÎ·Î³Î¿ÏÏÏÎµÏÎ· Î±Î½Î±Î¶Î®ÏÎ·ÏÎ·", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -281,19 +281,21 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER LTEXT "File system:", -1, 15, 70, 100, 10 EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Used space:", -1, 25, 90, 120, 10 EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Free space:", -1, 25, 105, 70, 10 EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -302,9 +304,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -213,7 +213,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Tipo:", 14004, 8, 35, 50, 10 LTEXT "Carpeta de archivos", 14005, 68, 35, 160, 10 @@ -234,7 +234,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Tipo de archivo:", 14004, 8, 35, 55, 10 LTEXT "Archivo", 14005, 68, 35, 160, 10 @@ -281,7 +281,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Tipo:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -302,9 +304,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Unidad %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Unidad %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Liberar espacio en disco", 14010, 160, 175, 80, 15, WS_TABSTOP CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 5, 205, 180, 10, WS_DISABLED CHECKBOX "Permitir a Index Server indizar el disco para acelerar la bÃºsqueda", 14012, 5, 220, 220, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -214,7 +214,7 @@ CAPTION "GÃ©nÃ©ral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 LTEXT "Dossier", 14005, 68, 35, 160, 10 @@ -235,7 +235,7 @@ CAPTION "GÃ©nÃ©ral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 LTEXT "Fichier", 14005, 68, 35, 160, 10 @@ -282,7 +282,9 @@ CAPTION "GÃ©nÃ©ral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type :", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -303,9 +305,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Lecteur %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Lecteur %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Nettoyage de disque", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Autoriser le service d'indexation Ã indexer ce disque pour une recherche rapide de fichiers", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -213,7 +213,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -234,7 +234,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -281,7 +281,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -302,9 +304,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -211,7 +211,7 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Tipo del file:", 14004, 8, 35, 50, 10 LTEXT "Cartella", 14005, 68, 35, 160, 10 @@ -232,7 +232,7 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Tipo di file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -279,7 +279,9 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Tipo:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -300,9 +302,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Disco %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Disco %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Pulitura disco", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Indicizza il disco per ricerche piÃ¹ rapide dei file", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "å¨è¬" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "ãã¡ã¤ã«ã®ç¨®é¡:", 14004, 8, 35, 50, 10 LTEXT "ãã©ã«ã", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "å¨è¬" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "ãã¡ã¤ã«ã®ç¨®é¡:", 14004, 8, 35, 50, 10 LTEXT "ãã¡ã»Cã«", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "å¨è¬" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "ç¨®é¡:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "ãã©ã¤ã %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "ãã©ã¤ã %c", 14009, 100, 170, 40, 10 PUSHBUTTON "ãã£ã¹ã¯ã®ã¯ãªã¼ã³ã¢ãã", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "ãã©ã¤ããå§ç¸®ãã¦ãã£ã¹ã¯é åãç¢ºä¿ãã", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "ãã®ãã£ã¹ã¯ã«ã¤ã³ããã¯ã¹ãä»ãã¦ãã¡ã¤ã«æ¤ç´¢ãéãããã", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Filtype:", 14004, 8, 35, 50, 10 LTEXT "Mappe", 14005, 68, 35, 160, 10 @@ -232,7 +232,7 @@ CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Filtype:", 14004, 8, 35, 50, 10 LTEXT "Fil", 14005, 68, 35, 160, 10 @@ -279,7 +279,9 @@ CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -300,9 +302,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Stasjon %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Stasjon %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Diskoppryding", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Komprimer denne stasjonen for Ã¥ frigjÃ¸re diskplass", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Indekser denne stasjonen for raskere sÃ¸king", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -218,7 +218,7 @@ CAPTION "OgÃ³lne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Rozszerzenie:", 14004, 8, 35, 50, 10 LTEXT "Katalog", 14005, 68, 35, 160, 10 @@ -239,7 +239,7 @@ CAPTION "OgÃ³lne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Typ pliku:", 14004, 8, 35, 50, 10 LTEXT "Plik", 14005, 68, 35, 160, 10 @@ -286,7 +286,9 @@ CAPTION "OgÃ³lne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Typ:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -307,9 +309,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "NapÄd %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "NapÄd %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Czyszczenie dysku", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Kompresja danych na dysku", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "ZezwÃ³l UsÅudze Indeksowania na zaindeksowanie tego dysku (szybkie przeszukiwanie plikÃ³w)", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -212,7 +212,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -233,7 +233,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -280,7 +280,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -301,9 +303,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -213,7 +213,7 @@ CAPTION "Geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Tipo de ficheiro:", 14004, 8, 35, 50, 10 LTEXT "Pasta", 14005, 68, 35, 160, 10 @@ -234,7 +234,7 @@ CAPTION "geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Tipo de Ficheiro:", 14004, 8, 35, 50, 10 LTEXT "Ficheiro", 14005, 68, 35, 160, 10 @@ -281,7 +281,9 @@ CAPTION "Geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Tipo:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -302,9 +304,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Disco %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Disco %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Limpeza do Disco", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Comprimir unidade para libertar espaÃ§o no disco", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "permitir indexar este disco para acelerar a procura de ficheiros", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -304,7 +304,7 @@ CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - LTEXT "PartiÈie %s", 14009, 100, 170, 40, 10 + LTEXT "PartiÈie %c", 14009, 100, 170, 40, 10 PUSHBUTTON "CurÄÈare discâ¦", 14010, 165, 175, 65, 15, WS_TABSTOP CHECKBOX "ComprimÄ pentru a economisi spaÈiu", 14011, 15, 200, 180, 10, WS_DISABLED CHECKBOX "Permite âServiciu de indexareâ, pentru accelerarea cÄutÄrilor", 14012, 15, 215, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "ÐÐ±ÑÐ¸Ðµ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ð°:", 14004, 8, 35, 50, 10 LTEXT "ÐÐ°Ð¿ÐºÐ°", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "ÐÐ±ÑÐ¸Ðµ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ð°:", 14004, 8, 35, 50, 10 LTEXT "ÑÐ°Ð¹Ð»", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "ÐÐ±ÑÐ¸Ðµ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Ð¢Ð¸Ð¿:", -1, 15, 49, 40, 10 EDITTEXT 14001, 110, 49, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -301,7 +303,7 @@ CONTROL "", 14015, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 20, 140, 200, 20 - LTEXT "ÐÐ¸ÑÐº %s", 14009, 100, 170, 52, 10 + LTEXT "ÐÐ¸ÑÐº %c", 14009, 100, 170, 52, 10 PUSHBUTTON "ÐÑÐ¸ÑÑÐºÐ° Ð´Ð¸ÑÐºÐ°", 14010, 166, 175, 64, 15, WS_TABSTOP CHECKBOX "&Ð¡Ð¶Ð¸Ð¼Ð°ÑÑ Ð´Ð»Ñ ÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ð¸ Ð¼ÐµÑÑÐ°", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ &Ð¸Ð½Ð´ÐµÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð´Ð¸ÑÐºÐ° Ð´Ð»Ñ Ð±ÑÑÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð¸ÑÐºÐ°", 14012, 15, 220, 216, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -216,7 +216,7 @@ CAPTION "VÅ¡eobecnÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Typ:", 14004, 8, 35, 50, 10 LTEXT "PrieÄinok", 14005, 68, 35, 160, 10 @@ -237,7 +237,7 @@ CAPTION "VÅ¡eobecnÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Typ sÃºboru:", 14004, 8, 35, 50, 10 LTEXT "SÃºbor", 14005, 68, 35, 160, 10 @@ -284,7 +284,9 @@ CAPTION "VÅ¡eobecnÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Typ:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -305,9 +307,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Jednotka %s", 14009, 100, 170, 45, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Jednotka %c", 14009, 100, 170, 45, 10 PUSHBUTTON "&Äistenie disku", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "UÅ¡etriÅ¥ miesto na disku &kompresiou jednotky", 14011, 10, 205, 180, 10, WS_DISABLED CHECKBOX "&PovoliÅ¥ indexovanie pre tento disk, a zrÃ½chliÅ¥ tak hÄ¾adanie sÃºborov", 14012, 10, 220, 225, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -212,7 +212,7 @@ CAPTION "ÐÐ°Ð³Ð°Ð»ÑÐ½Ñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ñ:", 14004, 8, 35, 50, 10 LTEXT "Ð¢ÐµÐºÐ°", 14005, 68, 35, 160, 10 @@ -233,7 +233,7 @@ CAPTION "ÐÐ°Ð³Ð°Ð»ÑÐ½Ñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ñ:", 14004, 8, 35, 50, 10 LTEXT "Ð¤Ð°Ð¹Ð»", 14005, 68, 35, 160, 10 @@ -280,7 +280,9 @@ CAPTION "ÐÐ°Ð³Ð°Ð»ÑÐ½Ñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Ð¢Ð¸Ð¿:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -301,9 +303,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "ÐÐ¸ÑÐº %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "ÐÐ¸ÑÐº %c", 14009, 100, 170, 40, 10 PUSHBUTTON "ÐÑÐ¸ÑÐµÐ½Ð½Ñ Ð´Ð¸ÑÐºÑ", 14010, 178, 175, 60, 15, WS_TABSTOP CHECKBOX "Ð¡ÑÐ¸ÑÐºÐ°ÑÐ¸ Ð´Ð¸ÑÐº Ð´Ð»Ñ Ð·Ð°Ð¾ÑÐ°Ð´Ð¶ÐµÐ½Ð½Ñ Ð¼ÑÑÑÑ", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÐ¸ ÑÐ½Ð´ÐµÐºÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð¸ÑÐºÑ Ð´Ð»Ñ Ð¿ÑÐ¸ÑÐºÐ¾ÑÐµÐ½Ð½Ñ Ð¿Ð¾ÑÑÐºÑ", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -199,7 +199,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -220,7 +220,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -267,7 +267,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -288,9 +290,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Thu Jan 12 20:10:35 2012 @@ -210,7 +210,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "Folder", 14005, 68, 35, 160, 10 @@ -231,7 +231,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Type of file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 @@ -278,7 +278,9 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN + ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -299,9 +301,9 @@ EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - - LTEXT "Drive %s", 14009, 100, 170, 40, 10 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 + + LTEXT "Drive %c", 14009, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Compress drive to save disk space", 14011, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED

1 0

[rharabien] 54925: [SHELL32] - Fix first chance exception if application has no strings in version info - If Lang is not set use US English version info. Fixes WinRAR version info. - Applications h...
by rharabien＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: rharabien Date: Thu Jan 12 16:32:02 2012 New Revision: 54925 URL: http://svn.reactos.org/svn/reactos?rev=54925&view=rev Log: [SHELL32] - Fix first chance exception if application has no strings in version info - If Lang is not set use US English version info. Fixes WinRAR version info. - Applications has Description filed instead of Opens With - Load language in file version info Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp trunk/reactos/dll/win32/shell32/filedefext.h Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] Thu Jan 12 16:32:02 2012 @@ -49,18 +49,20 @@ LPLANGANDCODEPAGE lpLangCode; UINT cBytes; - if (!VerQueryValueW(m_pInfo, L"VarFileInfo\\Translation", (LPVOID *)&lpLangCode, &cBytes)) + if (!VerQueryValueW(m_pInfo, L"\\VarFileInfo\\Translation", (LPVOID *)&lpLangCode, &cBytes) || cBytes < sizeof(LANGANDCODEPAGE)) { ERR("VerQueryValueW failed\n"); return FALSE; } - /* FIXME: find language from current locale / if not available, - * default to english - * for now default to first available language - */ - m_wLang = lpLangCode->lang; - m_wCode = lpLangCode->code; + /* FIXME: find language from current locale / if not available, + * default to english + * for now default to first available language + */ + m_wLang = lpLangCode->wLang; + m_wCode = lpLangCode->wCode; + TRACE("Lang %hx Code %hu\n", m_wLang, m_wCode); + return TRUE; } @@ -72,10 +74,24 @@ WCHAR wszBuf[256]; swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\%s", m_wLang, m_wCode, pwszName); + /* Query string in version block */ LPCWSTR pwszResult = NULL; UINT cBytes = 0; if (!VerQueryValueW(m_pInfo, wszBuf, (LPVOID *)&pwszResult, &cBytes)) - return NULL; + pwszResult = NULL; + + if (!m_wLang && !m_wCode) + { + /* Try US English */ + swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\%s", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1252, pwszName); + if (!VerQueryValueW(m_pInfo, wszBuf, (LPVOID *)&pwszResult, &cBytes)) + pwszResult = NULL; + } + + if (!pwszResult) + ERR("VerQueryValueW %ls failed\n", pwszName); + else + TRACE("%ls: %ls\n", pwszName, pwszResult); return pwszResult; } @@ -90,6 +106,20 @@ if (!VerQueryValueW(m_pInfo, L"\\", (PVOID*)&pInfo, &cBytes)) return NULL; return pInfo; +} + +LPCWSTR CFileVersionInfo::GetLangName() +{ + if (!m_pInfo) + return NULL; + + if (!m_wszLang[0]) + { + if (!VerLanguageNameW(m_wLang, m_wszLang, _countof(m_wszLang))) + ERR("VerLanguageNameW failed\n"); + } + + return m_wszLang; } /************************************************************************* @@ -499,9 +529,13 @@ InitOpensWithField(hwndDlg); else { + SetDlgItemTextW(hwndDlg, 14006, L"Description:"); // FIXME + ShowWindow(GetDlgItem(hwndDlg, 140062), SW_HIDE); LPCWSTR pwszDescr = m_VerInfo.GetString(L"FileDescription"); if (pwszDescr) SetDlgItemTextW(hwndDlg, 14007, pwszDescr); + else + SetDlgItemTextW(hwndDlg, 14007, PathFindFileNameW(m_wszPath)); } /* Set file created/modfied/accessed time */ @@ -571,7 +605,13 @@ /* Add items to listbox */ AddVersionString(hwndDlg, L"CompanyName"); - /* FIXME insert language identifier */ + LPCWSTR pwszLang = m_VerInfo.GetLangName(); + if (pwszLang) + { + HWND hDlgCtrl = GetDlgItem(hwndDlg, 14009); + UINT Index = SendMessageW(hDlgCtrl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)L"Language"); + SendMessageW(hDlgCtrl, LB_SETITEMDATA, (WPARAM)Index, (LPARAM)(WCHAR *)pwszLang); + } AddVersionString(hwndDlg, L"ProductName"); AddVersionString(hwndDlg, L"InternalName"); AddVersionString(hwndDlg, L"OriginalFilename"); @@ -584,8 +624,9 @@ /* Select first item */ HWND hDlgCtrl = GetDlgItem(hwndDlg, 14009); SendMessageW(hDlgCtrl, LB_SETCURSEL, 0, 0); - LPCWSTR pwszText = (WCHAR *)SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)0, (LPARAM)NULL); - SetDlgItemTextW(hwndDlg, 14010, pwszText); + LPCWSTR pwszText = (LPCWSTR)SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)0, (LPARAM)NULL); + if (pwszText && pwszText != (LPCWSTR)LB_ERR) + SetDlgItemTextW(hwndDlg, 14010, pwszText); return TRUE; } @@ -594,7 +635,7 @@ * * CFileDefExt::SetVersionLabel [Internal] * - * + * retrieves a version string and uses it to set label text */ BOOL @@ -620,7 +661,6 @@ * CFileDefExt::AddVersionString [Internal] * * retrieves a version string and adds it to listbox - * */ BOOL Modified: trunk/reactos/dll/win32/shell32/filedefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] Thu Jan 12 16:32:02 2012 @@ -26,16 +26,20 @@ private: PVOID m_pInfo; WORD m_wLang, m_wCode; + WCHAR m_wszLang[64]; typedef struct _LANGANDCODEPAGE_ { - WORD lang; - WORD code; + WORD wLang; + WORD wCode; } LANGANDCODEPAGE, *LPLANGANDCODEPAGE; public: inline CFileVersionInfo(): - m_pInfo(NULL), m_wLang(0), m_wCode(0) {} + m_pInfo(NULL), m_wLang(0), m_wCode(0) + { + m_wszLang[0] = L'\0'; + } inline ~CFileVersionInfo() { @@ -44,10 +48,9 @@ } BOOL Load(LPCWSTR pwszPath); - LPCWSTR GetString(LPCWSTR pwszName); - VS_FIXEDFILEINFO *GetFixedInfo(); + LPCWSTR GetLangName(); }; class CFileDefExt :

1 0

[tkreuzer] 54924: [WIN32K] Try to fix boot
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 15:41:56 2012 New Revision: 54924 URL: http://svn.reactos.org/svn/reactos?rev=54924&view=rev Log: [WIN32K] Try to fix boot Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Jan 12 15:41:56 2012 @@ -785,7 +785,7 @@ /* Allocate a new bitmap with the same dimensions as the source bmp */ hbmNew = GreCreateBitmapEx(psurfSrc->SurfObj.sizlBitmap.cx, psurfSrc->SurfObj.sizlBitmap.cy, - psurfSrc->SurfObj.lDelta, + abs(psurfSrc->SurfObj.lDelta), psurfSrc->SurfObj.iBitmapFormat, psurfSrc->SurfObj.fjBitmap, psurfSrc->SurfObj.cjBits,

1 0

[rharabien] 54923: [SHELL32] - Fix copying files in New menu. Fixes WinRAR new items. - Don't show message if copying file failed because empty file is already created
by rharabien＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: rharabien Date: Thu Jan 12 14:47:26 2012 New Revision: 54923 URL: http://svn.reactos.org/svn/reactos?rev=54923&view=rev Log: [SHELL32] - Fix copying files in New menu. Fixes WinRAR new items. - Don't show message if copying file failed because empty file is already created Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] Thu Jan 12 14:47:26 2012 @@ -118,15 +118,15 @@ /* Find first valid value */ struct { - LPCSTR pszName; + LPCWSTR pszName; SHELLNEW_TYPE Type; BOOL bNeedData; BOOL bStr; } Types[] = { - {"FileName", SHELLNEW_TYPE_FILENAME, TRUE, TRUE}, - {"Command", SHELLNEW_TYPE_COMMAND, TRUE, TRUE}, - {"Data", SHELLNEW_TYPE_DATA, TRUE, FALSE}, - {"NullFile", SHELLNEW_TYPE_NULLFILE, FALSE}, + {L"FileName", SHELLNEW_TYPE_FILENAME, TRUE, TRUE}, + {L"Command", SHELLNEW_TYPE_COMMAND, TRUE, TRUE}, + {L"Data", SHELLNEW_TYPE_DATA, TRUE, FALSE}, + {L"NullFile", SHELLNEW_TYPE_NULLFILE, FALSE}, {NULL} }; UINT i; @@ -136,12 +136,20 @@ /* Note: We are using ANSI function because strings can be treated as data */ cbData = 0; DWORD dwFlags = Types[i].bStr ? RRF_RT_REG_SZ : RRF_RT_ANY; - if (RegGetValueA(hKey, NULL, Types[i].pszName, dwFlags, NULL, NULL, &cbData) == ERROR_SUCCESS) + DWORD dwType; + if (RegGetValueW(hKey, NULL, Types[i].pszName, dwFlags, NULL, NULL, &cbData) == ERROR_SUCCESS) { if (Types[i].bNeedData && cbData > 0) { pData = (BYTE*)malloc(cbData); - RegGetValueA(hKey, NULL, Types[i].pszName, dwFlags, NULL, pData, &cbData); + RegGetValueW(hKey, NULL, Types[i].pszName, dwFlags, &dwType, pData, &cbData); + if (!Types[i].bStr && (dwType == REG_SZ || dwType == REG_EXPAND_SZ)) + { + PBYTE pData2 = (PBYTE)malloc(cbData); + cbData = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)pData, -1, (LPSTR)pData2, cbData, NULL, NULL); + free(pData); + pData = pData2; + } } break; } @@ -494,7 +502,8 @@ if (pItem->Type == SHELLNEW_TYPE_FILENAME) { /* Copy file */ - bSuccess = CopyFileW((LPWSTR)pItem->pData, wszPath, FALSE); + if (!CopyFileW((LPWSTR)pItem->pData, wszPath, FALSE)) + ERR("Copy file failed: %ls\n", (LPWSTR)pItem->pData); } /* Show message if we failed */

1 0

[tkreuzer] 54922: [WIN32K] - Simplify BITMAP_CopyBitmap, by using the SURFOBJ members directly instead of calling BITMAP_GetObject. - Use RtlCopyMemory directly in BITMAP_CopyBitmap and remove IntS...
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 14:42:59 2012 New Revision: 54922 URL: http://svn.reactos.org/svn/reactos?rev=54922&view=rev Log: [WIN32K] - Simplify BITMAP_CopyBitmap, by using the SURFOBJ members directly instead of calling BITMAP_GetObject. - Use RtlCopyMemory directly in BITMAP_CopyBitmap and remove IntSetBitmapBits - Improve prototype of GreCreateBitmap(Ex) by using ULONG instead of INT for the bitmap dimensions (negative values are invalid) - remove a duplicated type definition Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Thu Jan 12 14:42:59 2012 @@ -4,25 +4,25 @@ HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); HBITMAP -APIENTRY +NTAPI GreCreateBitmap( - IN INT nWidth, - IN INT nHeight, - IN UINT cPlanes, - IN UINT cBitsPixel, - IN OPTIONAL PVOID pvBits); + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cPlanes, + _In_ ULONG cBitsPixel, + _In_opt_ PVOID pvBits); HBITMAP -APIENTRY +NTAPI GreCreateBitmapEx( - IN INT nWidth, - IN INT nHeight, - IN ULONG cjWidthBytes, - IN ULONG iFormat, - IN USHORT fjBitmap, - IN ULONG cjBits, - IN OPTIONAL PVOID pvBits, - IN FLONG flags); + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cjWidthBytes, + _In_ ULONG iFormat, + _In_ USHORT fjBitmap, + _In_ ULONG cjSizeImage, + _In_opt_ PVOID pvBits, + _In_ FLONG flags); HBITMAP FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Jan 12 14:42:59 2012 @@ -3,27 +3,13 @@ * PROJECT: ReactOS kernel * PURPOSE: Bitmap functions * FILE: subsys/win32k/objects/bitmaps.c - * PROGRAMER: Unknown + * PROGRAMER: Timo Kreuzer <timo.kreuzer(a)reactos.org> */ #include <win32k.h> #define NDEBUG #include <debug.h> - -LONG APIENTRY -IntSetBitmapBits( - PSURFACE psurf, - DWORD Bytes, - IN PBYTE Bits) -{ - /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); - - RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes); - - return Bytes; -} void NTAPI @@ -57,16 +43,16 @@ } HBITMAP -APIENTRY +NTAPI GreCreateBitmapEx( - IN INT nWidth, - IN INT nHeight, - IN ULONG cjWidthBytes, - IN ULONG iFormat, - IN USHORT fjBitmap, - IN ULONG cjSizeImage, - IN OPTIONAL PVOID pvBits, - IN FLONG flags) + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cjWidthBytes, + _In_ ULONG iFormat, + _In_ USHORT fjBitmap, + _In_ ULONG cjSizeImage, + _In_opt_ PVOID pvBits, + _In_ FLONG flags) { PSURFACE psurf; HBITMAP hbmp; @@ -134,13 +120,13 @@ * Note that each scanline must be 32bit aligned! */ HBITMAP -APIENTRY +NTAPI GreCreateBitmap( - IN INT nWidth, - IN INT nHeight, - IN UINT cPlanes, - IN UINT cBitsPixel, - IN OPTIONAL PVOID pvBits) + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cPlanes, + _In_ ULONG cBitsPixel, + _In_opt_ PVOID pvBits) { /* Call the extended function */ return GreCreateBitmapEx(nWidth, @@ -433,7 +419,7 @@ psurf = dc->dclevel.pSurface; if (psurf) { - pso = &psurf->SurfObj; + pso = &psurf->SurfObj; EXLATEOBJ_vInitialize(&exlo, psurf->ppal, &gpalRGB, 0, 0xffffff, 0); // Check if this DC has a DIB behind it... if (pso->pvScan0) // STYPE_BITMAP == pso->iType @@ -476,8 +462,6 @@ HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap(hDCTmp, hBmpTmp); if (hBmpOld) { - PSURFACE psurf; - NtGdiBitBlt(hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0); NtGdiSelectBitmap(hDCTmp, hBmpOld); @@ -503,10 +487,10 @@ FASTCALL UnsafeGetBitmapBits( PSURFACE psurf, - DWORD Bytes, - OUT PBYTE pvBits) -{ - PUCHAR pjDst, pjSrc; + DWORD Bytes, + OUT PBYTE pvBits) +{ + PUCHAR pjDst, pjSrc; LONG lDeltaDst, lDeltaSrc; ULONG nWidth, nHeight, cBitsPixel; @@ -529,20 +513,24 @@ } } -LONG APIENTRY +LONG +APIENTRY NtGdiGetBitmapBits( HBITMAP hBitmap, - ULONG Bytes, + ULONG cjBuffer, OUT OPTIONAL PBYTE pUnsafeBits) { PSURFACE psurf; - LONG bmSize, ret; - - if (pUnsafeBits != NULL && Bytes == 0) + ULONG cjSize; + LONG ret; + + /* Check parameters */ + if (pUnsafeBits != NULL && cjBuffer == 0) { return 0; } + /* Lock the bitmap */ psurf = SURFACE_ShareLockSurface(hBitmap); if (!psurf) { @@ -550,26 +538,27 @@ return 0; } - bmSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx, - BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * - abs(psurf->SurfObj.sizlBitmap.cy); + /* Calculate the size of the bitmap in bytes */ + cjSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx, + BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * + abs(psurf->SurfObj.sizlBitmap.cy); /* If the bits vector is null, the function should return the read size */ if (pUnsafeBits == NULL) { SURFACE_ShareUnlockSurface(psurf); - return bmSize; + return cjSize; } /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, bmSize); + cjBuffer = min(cjBuffer, cjSize); // FIXME: Use MmSecureVirtualMemory _SEH2_TRY { - ProbeForWrite(pUnsafeBits, Bytes, 1); - UnsafeGetBitmapBits(psurf, Bytes, pUnsafeBits); - ret = Bytes; + ProbeForWrite(pUnsafeBits, cjBuffer, 1); + UnsafeGetBitmapBits(psurf, cjBuffer, pUnsafeBits); + ret = cjBuffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -776,63 +765,65 @@ /* Internal Functions */ -HBITMAP FASTCALL +HBITMAP +FASTCALL BITMAP_CopyBitmap(HBITMAP hBitmap) { - HBITMAP res; - BITMAP bm; - SURFACE *Bitmap, *resBitmap; - SIZEL Size; - - if (hBitmap == NULL) + HBITMAP hbmNew; + SURFACE *psurfSrc, *psurfNew; + + /* Fail, if no source bitmap is given */ + if (hBitmap == NULL) return 0; + + /* Lock the source bitmap */ + psurfSrc = SURFACE_ShareLockSurface(hBitmap); + if (psurfSrc == NULL) { return 0; } - Bitmap = SURFACE_ShareLockSurface(hBitmap); - if (Bitmap == NULL) - { - return 0; - } - - BITMAP_GetObject(Bitmap, sizeof(BITMAP), (PVOID)&bm); - bm.bmBits = NULL; - if (Bitmap->SurfObj.lDelta >= 0) - bm.bmHeight = -bm.bmHeight; - - Size.cx = abs(bm.bmWidth); - Size.cy = abs(bm.bmHeight); - res = GreCreateBitmapEx(Size.cx, - Size.cy, - bm.bmWidthBytes, - Bitmap->SurfObj.iBitmapFormat, - Bitmap->SurfObj.fjBitmap, - Bitmap->SurfObj.cjBits, - NULL, - Bitmap->flags); - - - if (res) - { - resBitmap = SURFACE_ShareLockSurface(res); - if (resBitmap) - { - IntSetBitmapBits(resBitmap, Bitmap->SurfObj.cjBits, Bitmap->SurfObj.pvBits); - GDIOBJ_vReferenceObjectByPointer(&Bitmap->ppal->BaseObject); - GDIOBJ_vDereferenceObject(&resBitmap->ppal->BaseObject); - resBitmap->ppal = Bitmap->ppal; - SURFACE_ShareUnlockSurface(resBitmap); + /* Allocate a new bitmap with the same dimensions as the source bmp */ + hbmNew = GreCreateBitmapEx(psurfSrc->SurfObj.sizlBitmap.cx, + psurfSrc->SurfObj.sizlBitmap.cy, + psurfSrc->SurfObj.lDelta, + psurfSrc->SurfObj.iBitmapFormat, + psurfSrc->SurfObj.fjBitmap, + psurfSrc->SurfObj.cjBits, + NULL, + psurfSrc->flags); + + if (hbmNew) + { + /* Lock the new bitmap */ + psurfNew = SURFACE_ShareLockSurface(hbmNew); + if (psurfNew) + { + /* Copy the bitmap bits to the new bitmap buffer */ + RtlCopyMemory(psurfNew->SurfObj.pvBits, + psurfSrc->SurfObj.pvBits, + psurfNew->SurfObj.cjBits); + + /* Dereference the new bitmaps palette, we will use a different */ + GDIOBJ_vDereferenceObject(&psurfNew->ppal->BaseObject); + + /* Reference the palette of the source bitmap and use it */ + GDIOBJ_vReferenceObjectByPointer(&psurfSrc->ppal->BaseObject); + psurfNew->ppal = psurfSrc->ppal; + + /* Unlock the new surface */ + SURFACE_ShareUnlockSurface(psurfNew); } else { - GreDeleteObject(res); - res = NULL; - } - } - - SURFACE_ShareUnlockSurface(Bitmap); - - return res; + /* Failed to lock the bitmap, shouldn't happen */ + GreDeleteObject(hbmNew); + hbmNew = NULL; + } + } + + /* Unlock the source bitmap and return the handle of the new bitmap */ + SURFACE_ShareUnlockSurface(psurfSrc); + return hbmNew; } INT APIENTRY @@ -850,15 +841,15 @@ pBitmap->bmHeight = psurf->SurfObj.sizlBitmap.cy; pBitmap->bmPlanes = 1; pBitmap->bmBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN16(pBitmap->bmWidth, pBitmap->bmBitsPixel); + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN16(pBitmap->bmWidth, pBitmap->bmBitsPixel); /* Check for DIB section */ if (psurf->hSecure) { /* Set bmBits in this case */ pBitmap->bmBits = psurf->SurfObj.pvBits; - /* DIBs data are 32 bits aligned */ - pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN32(pBitmap->bmWidth, pBitmap->bmBitsPixel); + /* DIBs data are 32 bits aligned */ + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN32(pBitmap->bmWidth, pBitmap->bmBitsPixel); if (Count >= sizeof(DIBSECTION)) {

1 0

[tkreuzer] 54921: [PSDK] Remove a deprecated definition from winddi.h
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 14:32:43 2012 New Revision: 54921 URL: http://svn.reactos.org/svn/reactos?rev=54921&view=rev Log: [PSDK] Remove a deprecated definition from winddi.h Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Thu Jan 12 14:32:43 2012 @@ -427,7 +427,6 @@ #define INDEX_DrvReserved11 92L #if (NTDDI_VERSION >= NTDDI_VISTA) #define INDEX_DrvRenderHint 93L -#define INDEX_LAST 93L #if (NTDDI_VERSION >= NTDDI_WIN7) #define INDEX_DrvCreateDeviceBitmapEx 94L #define INDEX_DrvDeleteDeviceBitmapEx 95L

1 0

[tkreuzer] 54920: [PSDK] - Add some missing definitions (Vista+) to winddi.h - Fix and improve annotations in winddi.h
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 13:24:32 2012 New Revision: 54920 URL: http://svn.reactos.org/svn/reactos?rev=54920&view=rev Log: [PSDK] - Add some missing definitions (Vista+) to winddi.h - Fix and improve annotations in winddi.h Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Thu Jan 12 13:24:32 2012 @@ -23,6 +23,7 @@ #ifndef _WINDDI_ #define _WINDDI_ +#pragma once #ifdef __VIDEO_H__ #error video.h cannot be included with winddi.h @@ -48,17 +49,14 @@ #define DDI_DRIVER_VERSION_SP3 0x00020003 #define DDI_DRIVER_VERSION_NT5 0x00030000 #define DDI_DRIVER_VERSION_NT5_01 0x00030100 +#define DDI_DRIVER_VERSION_NT5_01_SP1 0x00030101 #define GDI_DRIVER_VERSION 0x4000 -#ifdef _X86_ - +#if defined(_X86_) && !defined(USERMODE_DRIVER) && !defined(BUILD_WOW6432) typedef DWORD FLOATL; - -#else /* !_X86_ */ - +#else typedef FLOAT FLOATL; - #endif typedef SHORT FWORD; @@ -184,7 +182,7 @@ POINTFIX ptfxB; LONG lStyleState; ULONG c; - RUN arun[1]; + _Field_size_(c) RUN arun[1]; } CLIPLINE, *PCLIPLINE; /* CLIPOBJ.iDComplexity constants */ @@ -427,7 +425,26 @@ #define INDEX_DrvReserved9 90L #define INDEX_DrvReserved10 91L #define INDEX_DrvReserved11 92L +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define INDEX_DrvRenderHint 93L #define INDEX_LAST 93L +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define INDEX_DrvCreateDeviceBitmapEx 94L +#define INDEX_DrvDeleteDeviceBitmapEx 95L +#define INDEX_DrvAssociateSharedSurface 96L +#define INDEX_DrvSynchronizeRedirectionBitmaps 97L +#define INDEX_DrvAccumulateD3DDirtyRect 98L +#define INDEX_DrvStartDxInterop 99L +#define INDEX_DrvEndDxInterop 100L +#define INDEX_DrvLockDisplayArea 101L +#define INDEX_DrvUnlockDisplayArea 102L +#define INDEX_LAST 103L +#else /* (NTDDI_VERSION >= NTDDI_WIN7) */ +#define INDEX_LAST 94L +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ +#else /* (NTDDI_VERSION >= NTDDI_VISTA) */ +#define INDEX_LAST 93L +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ typedef struct _DRVFN { ULONG iFunc; @@ -462,14 +479,14 @@ } ENGSAFESEMAPHORE; typedef struct _ENG_TIME_FIELDS { - USHORT usYear; - USHORT usMonth; - USHORT usDay; - USHORT usHour; - USHORT usMinute; - USHORT usSecond; - USHORT usMilliseconds; - USHORT usWeekday; + _Field_range_(1601,MAXUSHORT) USHORT usYear; + _Field_range_(1,12) USHORT usMonth; + _Field_range_(1,31) USHORT usDay; + _Field_range_(0,23) USHORT usHour; + _Field_range_(0,59) USHORT usMinute; + _Field_range_(0,59) USHORT usSecond; + _Field_range_(0,999) USHORT usMilliseconds; + _Field_range_(0,6) USHORT usWeekday; // 0 == Sunday } ENG_TIME_FIELDS, *PENG_TIME_FIELDS; typedef struct _ENUMRECTS { @@ -523,7 +540,7 @@ ULONG cjThis; ULONG cGlyphs; ULONG iMode; - BYTE aGlyphAttr[1]; + _Field_size_((cGlyphs+7)/8) BYTE aGlyphAttr[1]; } FD_GLYPHATTR, *PFD_GLYPHATTR; /* FD_GLYPHSET.flAccel */ @@ -542,7 +559,7 @@ FLONG flAccel; ULONG cGlyphsSupported; ULONG cRuns; - WCRUN awcrun[1]; + _Field_size_(cRuns) WCRUN awcrun[1]; } FD_GLYPHSET, *PFD_GLYPHSET; typedef struct _FD_KERNINGPAIR { @@ -561,7 +578,8 @@ typedef FLOAT FLOATOBJ, *PFLOATOBJ; #endif -typedef struct _FLOATOBJ_XFORM { +#ifndef USERMODE_DRIVER +typedef struct tagFLOATOBJ_XFORM { FLOATOBJ eM11; FLOATOBJ eM12; FLOATOBJ eM21; @@ -569,6 +587,9 @@ FLOATOBJ eDx; FLOATOBJ eDy; } FLOATOBJ_XFORM, *PFLOATOBJ_XFORM, FAR *LPFLOATOBJ_XFORM; +#else +typedef XFORML FLOATOBJ_XFORM, *PFLOATOBJ_XFORM, FAR *LPFLOATOBJ_XFORM; +#endif /* FONTDIFF.fsSelection */ #define FM_SEL_ITALIC 0x0001 @@ -1126,6 +1147,9 @@ #define WOC_DRAWN 0x00000040 #define WOC_SPRITE_OVERLAP 0x00000080 #define WOC_SPRITE_NO_OVERLAP 0x00000100 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define WOC_RGN_SPRITE 0x00000200 +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ typedef VOID (APIENTRY CALLBACK *WNDOBJCHANGEPROC)( _In_ WNDOBJ *pwo, @@ -1138,6 +1162,7 @@ BRUSHOBJ_hGetColorTransform( _In_ BRUSHOBJ *pbo); +_Ret_opt_bytecount_(cj) WIN32KAPI PVOID APIENTRY @@ -1193,6 +1218,14 @@ CLIPOBJ_ppoGetPath( _In_ CLIPOBJ *pco); +#if (NTDDI_VERSION >= NTDDI_VISTA) +WIN32KAPI +HANDLE +APIENTRY +CLIPOBJ_GetRgn( + _In_ CLIPOBJ* pco); +#endif + WIN32KAPI VOID APIENTRY @@ -1201,6 +1234,14 @@ #define FL_ZERO_MEMORY 0x00000001 #define FL_NONPAGED_MEMORY 0x00000002 + +#ifdef USERMODE_DRIVER + +#define EngAllocMem(fl, cj, tag) ((PVOID)GlobalAlloc(((fl) & FL_ZERO_MEMORY) ? GPTR : GMEM_FIXED, cj)) +#define EngAllocPrivateUserMem(psl, cj, tag) ((PVOID)GlobalAlloc(GMEM_FIXED, cj)) +#define EngAllocUserMem(cj, tag) ((PVOID)GlobalAlloc(GMEM_FIXED, cj)) + +#else _Must_inspect_result_ _When_(fl & FL_ZERO_MEMORY, _Ret_opt_bytecount_(cjMemSize)) @@ -1232,13 +1273,15 @@ _In_ SIZE_T cjMemSize, _In_ ULONG ulTag); +#endif /* USERMODE_DRIVER */ + WIN32KAPI BOOL APIENTRY EngAlphaBlend( _Inout_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, - _In_ CLIPOBJ *pco, + _In_opt_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDest, _In_ RECTL *prclSrc, @@ -1262,7 +1305,11 @@ #define HOOK_TRANSPARENTBLT 0x00008000 #define HOOK_ALPHABLEND 0x00010000 #define HOOK_GRADIENTFILL 0x00020000 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define HOOK_FLAGS 0x0003b5ef +#else #define HOOK_FLAGS 0x0003b5ff +#endif WIN32KAPI BOOL @@ -1279,13 +1326,13 @@ _Inout_ SURFOBJ *psoTrg, _In_opt_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, - _In_ CLIPOBJ *pco, + _In_opt_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclTrg, _When_(psoSrc, _In_) POINTL *pptlSrc, _When_(psoMask, _In_) POINTL *pptlMask, _In_opt_ BRUSHOBJ *pbo, - _In_opt_ POINTL *pptlBrush, + _When_(pbo, _In_) POINTL *pptlBrush, _In_ ROP4 rop4); WIN32KAPI @@ -1325,8 +1372,8 @@ EngCopyBits( _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDest, _In_ POINTL *pptlSrc); @@ -1338,13 +1385,14 @@ _In_ LONG lWidth, _In_ ULONG iFormat, _In_ FLONG fl, - _In_ PVOID pvBits); + _In_opt_ PVOID pvBits); WIN32KAPI CLIPOBJ* APIENTRY EngCreateClip(VOID); +_Must_inspect_result_ WIN32KAPI HBITMAP APIENTRY @@ -1416,6 +1464,9 @@ #define WO_DRAW_NOTIFY 0x00000040 #define WO_SPRITE_NOTIFY 0x00000080 #define WO_RGN_DESKTOP_COORD 0x00000100 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define WO_RGN_SPRITE 0x00000200 +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ _Must_inspect_result_ WIN32KAPI @@ -1428,6 +1479,7 @@ _In_ FLONG fl, _In_ INT iPixelFormat); +//_Analysis_noreturn_ WIN32KAPI VOID APIENTRY @@ -1445,13 +1497,13 @@ VOID APIENTRY EngDeleteClip( - _In_ CLIPOBJ *pco); + _In_ _Post_ptr_invalid_ CLIPOBJ *pco); WIN32KAPI BOOL APIENTRY EngDeleteDriverObj( - _In_ HDRVOBJ hdo, + _In_ _Post_ptr_invalid_ HDRVOBJ hdo, _In_ BOOL bCallBack, _In_ BOOL bLocked); @@ -1459,7 +1511,7 @@ BOOL APIENTRY EngDeleteEvent( - _In_ PEVENT pEvent); + _In_ _Post_ptr_invalid_ PEVENT pEvent); WIN32KAPI BOOL @@ -1471,13 +1523,13 @@ BOOL APIENTRY EngDeletePalette( - _In_ HPALETTE hpal); + _In_ _Post_ptr_invalid_ HPALETTE hpal); WIN32KAPI VOID APIENTRY EngDeletePath( - _Inout_ PATHOBJ *ppo); + _Inout_ _Post_ptr_invalid_ PATHOBJ *ppo); WIN32KAPI VOID @@ -1489,19 +1541,19 @@ VOID APIENTRY EngDeleteSemaphore( - _Inout_ HSEMAPHORE hsem); + _Inout_ _Post_ptr_invalid_ HSEMAPHORE hsem); WIN32KAPI BOOL APIENTRY EngDeleteSurface( - _In_ HSURF hsurf); + _In_ _Post_ptr_invalid_ HSURF hsurf); WIN32KAPI VOID APIENTRY EngDeleteWnd( - _Inout_ WNDOBJ *pwo); + _Inout_ _Post_ptr_invalid_ WNDOBJ *pwo); WIN32KAPI DWORD @@ -1600,17 +1652,19 @@ _In_ ULONG FastCheckSum, _Out_ ULONG *pulSize); +#ifdef USERMODE_DRIVER + +#define EngFreeMem(p) GlobalFree((HGLOBAL) (p)) +#define EngFreePrivateUserMem( psl, p) GlobalFree((HGLOBAL) (p)) +#define EngFreeUserMem(p) GlobalFree((HGLOBAL) (p)) + +#else /* !USERMODE_DRIVER */ + WIN32KAPI VOID APIENTRY EngFreeMem( _In_ _Post_ptr_invalid_ PVOID pv); - -WIN32KAPI -VOID -APIENTRY -EngFreeModule( - _In_ HANDLE h); WIN32KAPI VOID @@ -1624,6 +1678,15 @@ APIENTRY EngFreeUserMem( _In_ _Post_ptr_invalid_ PVOID pv); + +#endif /* !USERMODE_DRIVER */ + +WIN32KAPI +VOID +APIENTRY +EngFreeModule( + _In_ HANDLE h); + WIN32KAPI VOID @@ -1674,10 +1737,14 @@ _In_ DWORD cbBuf, _Out_ LPDWORD pcbNeeded); +#ifdef USERMODE_DRIVER +#define EngGetLastError GetLastError +#else WIN32KAPI ULONG APIENTRY EngGetLastError(VOID); +#endif WIN32KAPI BOOL @@ -1908,6 +1975,9 @@ _In_ LONG y, _In_ RECTL *prcl); +#ifdef USERMODE_DRIVER +#define EngMulDiv MulDiv +#else /* !USERMODE_DRIVER */ WIN32KAPI INT APIENTRY @@ -1915,6 +1985,7 @@ _In_ INT a, _In_ INT b, _In_ INT c); +#endif /* !USERMODE_DRIVER */ WIN32KAPI VOID @@ -1954,7 +2025,7 @@ _In_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMsk, _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ XLATEOBJ *pxlo, _In_ COLORADJUSTMENT *pca, _In_ POINTL *pptlBrushOrg, _In_ POINTFIX *pptfx, @@ -2091,20 +2162,24 @@ EngSetEvent( _In_ PEVENT pEvent); +#ifdef USERMODE_DRIVER +#define EngSetLastError SetLastError +#else WIN32KAPI VOID APIENTRY EngSetLastError( _In_ ULONG iError); +#endif WIN32KAPI ULONG APIENTRY EngSetPointerShape( _In_ SURFOBJ *pso, - _In_ SURFOBJ *psoMask, - _In_ SURFOBJ *psoColor, - _In_ XLATEOBJ *pxlo, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ SURFOBJ *psoColor, + _In_opt_ XLATEOBJ *pxlo, _In_ LONG xHot, _In_ LONG yHot, _In_ LONG x, @@ -2117,9 +2192,9 @@ APIENTRY EngSetPointerTag( _In_ HDEV hdev, - _In_ SURFOBJ *psoMask, - _In_ SURFOBJ *psoColor, - _In_ XLATEOBJ *pxlo, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ SURFOBJ *psoColor, + _Reserved_ XLATEOBJ *pxlo, _In_ FLONG fl); WIN32KAPI @@ -2150,9 +2225,9 @@ _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, - _In_ COLORADJUSTMENT *pca, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, _In_ POINTL *pptlHTOrg, _In_ RECTL *prclDest, _In_ RECTL *prclSrc, @@ -2166,9 +2241,9 @@ _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, - _In_ COLORADJUSTMENT *pca, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, _In_ POINTL *pptlHTOrg, _In_ RECTL *prclDest, _In_ RECTL *prclSrc, @@ -2226,8 +2301,8 @@ EngTransparentBlt( _In_ SURFOBJ *psoDst, _In_ SURFOBJ *psoSrc, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDst, _In_ RECTL *prclSrc, _In_ ULONG iTransColor, @@ -2259,13 +2334,13 @@ BOOL APIENTRY EngUnlockDriverObj( - _In_ HDRVOBJ hdo); + _In_ _Post_ptr_invalid_ HDRVOBJ hdo); WIN32KAPI VOID APIENTRY EngUnlockSurface( - _In_ SURFOBJ *pso); + _In_ _Post_ptr_invalid_ SURFOBJ *pso); WIN32KAPI BOOL @@ -2302,7 +2377,7 @@ APIENTRY EngWaitForSingleObject( _In_ PEVENT pEvent, - _In_ PLARGE_INTEGER pTimeOut); + _In_opt_ PLARGE_INTEGER pTimeOut); WIN32KAPI INT @@ -2584,7 +2659,12 @@ _In_ ULONG cjSize, _Out_bytecap_(cjSize) FONTINFO *pfi); - +#if (NTDDI_VERSION <= NTDDI_WINXP) +GAMMA_TABLES* +APIENTRY +FONTOBJ_pGetGammaTables( + _In_ FONTOBJ *pfo); +#endif WIN32KAPI LONG @@ -2666,7 +2746,7 @@ APIENTRY PATHOBJ_bPolyBezierTo( _In_ PATHOBJ *ppo, - _In_ POINTFIX *pptfx, + _In_count_(cptfx) POINTFIX *pptfx, _In_ ULONG cptfx); WIN32KAPI @@ -2674,7 +2754,7 @@ APIENTRY PATHOBJ_bPolyLineTo( _In_ PATHOBJ *ppo, - _In_ POINTFIX *pptfx, + _In_count_(cptfx) POINTFIX *pptfx, _In_ ULONG cptfx); WIN32KAPI @@ -2788,12 +2868,16 @@ _In_reads_bytes_(cPoints * sizeof(POINTL)) PVOID pvIn, _Out_writes_bytes_(cPoints * sizeof(POINTL)) PVOID pvOut); +#if !defined(USERMODE_DRIVER) WIN32KAPI ULONG APIENTRY XFORMOBJ_iGetFloatObjXform( _In_ XFORMOBJ *pxo, _Out_ FLOATOBJ_XFORM *pxfo); +#else +#define XFORMOBJ_iGetFloatObjXform XFORMOBJ_iGetXform +#endif WIN32KAPI ULONG @@ -2867,10 +2951,10 @@ _In_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclTrg, - _In_opt_ POINTL *pptlSrc, - _In_opt_ POINTL *pptlMask, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, _In_opt_ BRUSHOBJ *pbo, - _In_opt_ POINTL *pptlBrush, + _When_(pbo, _In_) POINTL *pptlBrush, _In_ ROP4 rop4); typedef FN_DrvBitBlt *PFN_DrvBitBlt; extern FN_DrvBitBlt DrvBitBlt; @@ -2887,7 +2971,7 @@ _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDest, _In_ POINTL *pptlSrc); typedef FN_DrvCopyBits *PFN_DrvCopyBits; @@ -2903,7 +2987,7 @@ typedef VOID (APIENTRY FN_DrvDeleteDeviceBitmap)( - _In_ DHSURF dhsurf); + _In_ _Post_ptr_invalid_ DHSURF dhsurf); typedef FN_DrvDeleteDeviceBitmap *PFN_DrvDeleteDeviceBitmap; extern FN_DrvDeleteDeviceBitmap DrvDeleteDeviceBitmap; @@ -3229,8 +3313,8 @@ _In_ DHPDEV dhpdev, _In_ FONTOBJ *pfo, _In_ ULONG iMode, - _In_count_(cGlyphs) HGLYPH *phg, - _Out_bytecap_(cGlyphs * sizeof(USHORT)) PVOID pvWidths, // CHECKME + _In_reads_(cGlyphs) HGLYPH *phg, + _Out_writes_bytes_(cGlyphs * sizeof(USHORT)) PVOID pvWidths, _In_ ULONG cGlyphs); typedef FN_DrvQueryAdvanceWidths *PFN_DrvQueryAdvanceWidths; extern FN_DrvQueryAdvanceWidths DrvQueryAdvanceWidths; @@ -3379,7 +3463,7 @@ _In_ PTRDIFF dpStart, _In_ ULONG cjBuf, _Out_opt_bytecap_(cjBuf) BYTE *pjBuf, - _Out_opt_ PBYTE *ppjTable, + _Outptr_opt_result_bytebuffer_all_maybenull_(*pcjTable) PBYTE *ppjTable, _Out_opt_ ULONG *pcjTable); typedef FN_DrvQueryTrueTypeTable *PFN_DrvQueryTrueTypeTable; extern FN_DrvQueryTrueTypeTable DrvQueryTrueTypeTable; @@ -3393,9 +3477,9 @@ (APIENTRY FN_DrvRealizeBrush)( _In_ BRUSHOBJ *pbo, _Inout_ SURFOBJ *psoTarget, // CHECKME - _In_ SURFOBJ *psoPattern, - _In_ SURFOBJ *psoMask, - _In_ XLATEOBJ *pxlo, + _In_opt_ SURFOBJ *psoPattern, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ XLATEOBJ *pxlo, _In_ ULONG iHatch); typedef FN_DrvRealizeBrush *PFN_DrvRealizeBrush; extern FN_DrvRealizeBrush DrvRealizeBrush; @@ -3591,6 +3675,8 @@ /* DrvSynchronizeSurface.fl constants */ #define DSS_TIMER_EVENT 0x00000001 #define DSS_FLUSH_EVENT 0x00000002 +#define DSS_RESERVED 0x00000004 +#define DSS_RESERVED1 0x00000008 typedef VOID (APIENTRY FN_DrvSynchronizeSurface)(

1 0

[tkreuzer] 54919: [PSDK] Rewrite sal.h so that it actually works with __desclspec()
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 12:52:33 2012 New Revision: 54919 URL: http://svn.reactos.org/svn/reactos?rev=54919&view=rev Log: [PSDK] Rewrite sal.h so that it actually works with __desclspec() Modified: trunk/reactos/include/psdk/sal.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=549…

1 0

[cgutman] 54918: [PCNET] - Remove an incorrect comment
by cgutman＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: cgutman Date: Thu Jan 12 03:16:48 2012 New Revision: 54918 URL: http://svn.reactos.org/svn/reactos?rev=54918&view=rev Log: [PCNET] - Remove an incorrect comment Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Thu Jan 12 03:16:48 2012 @@ -136,7 +136,6 @@ case OID_GEN_HARDWARE_STATUS: { GenericULONG = (ULONG)NdisHardwareStatusReady; - /* ((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); */ break; }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
56
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 January 2012