Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[hbelusca] 75304: Integrate the USERINIT changes r75295, r75302 and r75303 from the setup_improvements branch back to trunk.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 8 00:23:33 2017 New Revision: 75304 URL: http://svn.reactos.org/svn/reactos?rev=75304&view=rev Log: Integrate the USERINIT changes r75295, r75302 and r75303 from the setup_improvements branch back to trunk. Added: trunk/reactos/base/system/userinit/res/rosbitmap.bmp (with props) trunk/reactos/base/system/userinit/res/rosbitmap_mask.bmp (with props) trunk/reactos/base/system/userinit/res/rosbitmap_old.bmp (with props) Modified: trunk/reactos/base/system/userinit/lang/bg-BG.rc trunk/reactos/base/system/userinit/lang/cs-CZ.rc trunk/reactos/base/system/userinit/lang/de-DE.rc trunk/reactos/base/system/userinit/lang/el-GR.rc trunk/reactos/base/system/userinit/lang/en-US.rc trunk/reactos/base/system/userinit/lang/es-ES.rc trunk/reactos/base/system/userinit/lang/fr-FR.rc trunk/reactos/base/system/userinit/lang/he-IL.rc trunk/reactos/base/system/userinit/lang/hu-HU.rc trunk/reactos/base/system/userinit/lang/id-ID.rc trunk/reactos/base/system/userinit/lang/it-IT.rc trunk/reactos/base/system/userinit/lang/ja-JP.rc trunk/reactos/base/system/userinit/lang/lt-LT.rc trunk/reactos/base/system/userinit/lang/nl-NL.rc trunk/reactos/base/system/userinit/lang/no-NO.rc trunk/reactos/base/system/userinit/lang/pl-PL.rc trunk/reactos/base/system/userinit/lang/pt-BR.rc trunk/reactos/base/system/userinit/lang/ro-RO.rc trunk/reactos/base/system/userinit/lang/ru-RU.rc trunk/reactos/base/system/userinit/lang/sk-SK.rc trunk/reactos/base/system/userinit/lang/sq-AL.rc trunk/reactos/base/system/userinit/lang/sv-SE.rc trunk/reactos/base/system/userinit/lang/th-TH.rc trunk/reactos/base/system/userinit/lang/tr-TR.rc trunk/reactos/base/system/userinit/lang/uk-UA.rc trunk/reactos/base/system/userinit/lang/zh-CN.rc trunk/reactos/base/system/userinit/lang/zh-TW.rc trunk/reactos/base/system/userinit/livecd.c trunk/reactos/base/system/userinit/resource.h trunk/reactos/base/system/userinit/userinit.c trunk/reactos/base/system/userinit/userinit.h trunk/reactos/base/system/userinit/userinit.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/system/userinit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… Added: trunk/reactos/base/system/userinit/res/rosbitmap.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/res/r… Added: trunk/reactos/base/system/userinit/res/rosbitmap_mask.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/res/r… Added: trunk/reactos/base/system/userinit/res/rosbitmap_old.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/res/r… Modified: trunk/reactos/base/system/userinit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/resou… Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… Modified: trunk/reactos/base/system/userinit/userinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… Modified: trunk/reactos/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…

7 years, 5 months

[hbelusca] 75303: [USERINIT]: Paint the ReactOS logo transparently (with alpha channel), much like it's done in dll/cpl/sysdm/general.c . CORE-13527 #resolve This also fixes the drawing mismatch pr...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 8 00:04:21 2017 New Revision: 75303 URL: http://svn.reactos.org/svn/reactos?rev=75303&view=rev Log: [USERINIT]: Paint the ReactOS logo transparently (with alpha channel), much like it's done in dll/cpl/sysdm/general.c . CORE-13527 #resolve This also fixes the drawing mismatch problem reported at CORE-11323 #resolve Finally, add a standard comctl32 manifest. Added: branches/setup_improvements/base/system/userinit/res/rosbitmap.bmp - copied unchanged from r75302, branches/setup_improvements/dll/cpl/sysdm/resources/rosbitmap.bmp branches/setup_improvements/base/system/userinit/res/rosbitmap_mask.bmp - copied unchanged from r75302, branches/setup_improvements/dll/cpl/sysdm/resources/rosbitmap_mask.bmp branches/setup_improvements/base/system/userinit/res/rosbitmap_old.bmp - copied unchanged from r75302, branches/setup_improvements/base/system/userinit/res/rosbitmap.bmp Modified: branches/setup_improvements/base/system/userinit/livecd.c branches/setup_improvements/base/system/userinit/resource.h branches/setup_improvements/base/system/userinit/userinit.h branches/setup_improvements/base/system/userinit/userinit.rc Modified: branches/setup_improvements/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/livecd.c [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/livecd.c [iso-8859-1] Sat Jul 8 00:04:21 2017 @@ -11,27 +11,80 @@ HWND hLocaleList; BOOL bSpain = FALSE; +/* + * Taken and adapted from dll/cpl/sysdm/general.c + */ static VOID -InitImageInfo(PIMGINFO ImgInfo) -{ - BITMAP bitmap; - - ZeroMemory(ImgInfo, sizeof(*ImgInfo)); - - ImgInfo->hBitmap = LoadImageW(hInstance, - MAKEINTRESOURCEW(IDB_ROSLOGO), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - - if (ImgInfo->hBitmap != NULL) - { - GetObject(ImgInfo->hBitmap, sizeof(bitmap), &bitmap); - - ImgInfo->cxSource = bitmap.bmWidth; - ImgInfo->cySource = bitmap.bmHeight; - } +InitLogo(PIMGINFO pImgInfo, HWND hwndDlg) +{ + BITMAP logoBitmap; + BITMAP maskBitmap; + BITMAPINFO bmpi; + HDC hDC = GetDC(hwndDlg); + HDC hDCLogo = CreateCompatibleDC(NULL); + HDC hDCMask = CreateCompatibleDC(NULL); + HBITMAP hMask, hLogo, hAlphaLogo = NULL; + COLORREF *pBits; + INT line, column; + + ZeroMemory(pImgInfo, sizeof(*pImgInfo)); + ZeroMemory(&bmpi, sizeof(bmpi)); + + hLogo = (HBITMAP)LoadImageW(hInstance, MAKEINTRESOURCEW(IDB_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hMask = (HBITMAP)LoadImageW(hInstance, MAKEINTRESOURCEW(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + + if (hLogo != NULL && hMask != NULL) + { + GetObject(hLogo, sizeof(logoBitmap), &logoBitmap); + GetObject(hMask, sizeof(maskBitmap), &maskBitmap); + + if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth) + goto Cleanup; + + bmpi.bmiHeader.biSize = sizeof(BITMAPINFO); + bmpi.bmiHeader.biWidth = logoBitmap.bmWidth; + bmpi.bmiHeader.biHeight = logoBitmap.bmHeight; + bmpi.bmiHeader.biPlanes = 1; + bmpi.bmiHeader.biBitCount = 32; + bmpi.bmiHeader.biCompression = BI_RGB; + bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight; + + /* Create a premultiplied bitmap */ + hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0); + if (!hAlphaLogo) + goto Cleanup; + + SelectObject(hDCLogo, hLogo); + SelectObject(hDCMask, hMask); + + for (line = logoBitmap.bmHeight - 1; line >= 0; line--) + { + for (column = 0; column < logoBitmap.bmWidth; column++) + { + COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF; + COLORREF Color = GetPixel(hDCLogo, column, line); + DWORD r, g, b; + + r = GetRValue(Color) * alpha / 255; + g = GetGValue(Color) * alpha / 255; + b = GetBValue(Color) * alpha / 255; + + *pBits++ = b | g << 8 | r << 16 | alpha << 24; + } + } + + pImgInfo->hBitmap = hAlphaLogo; + pImgInfo->cxSource = logoBitmap.bmWidth; + pImgInfo->cySource = logoBitmap.bmHeight; + pImgInfo->iBits = logoBitmap.bmBitsPixel; + pImgInfo->iPlanes = logoBitmap.bmPlanes; + } + +Cleanup: + DeleteObject(hMask); + DeleteObject(hLogo); + DeleteDC(hDCMask); + DeleteDC(hDCLogo); } @@ -521,16 +574,19 @@ hdcMem = CreateCompatibleDC(lpDrawItem->hDC); if (hdcMem != NULL) { + static BLENDFUNCTION BlendFunc = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA}; + SelectObject(hdcMem, pState->ImageInfo.hBitmap); - BitBlt(lpDrawItem->hDC, - left, - lpDrawItem->rcItem.top, - lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, - 0, - 0, - SRCCOPY); + GdiAlphaBlend(lpDrawItem->hDC, + left, + lpDrawItem->rcItem.top, + pState->ImageInfo.cxSource, + pState->ImageInfo.cySource, + hdcMem, + 0, 0, + pState->ImageInfo.cxSource, + pState->ImageInfo.cySource, + BlendFunc); DeleteDC(hdcMem); } } @@ -754,7 +810,7 @@ RunLiveCD( PSTATE pState) { - InitImageInfo(&pState->ImageInfo); + InitLogo(&pState->ImageInfo, NULL); while (pState->NextPage != DONE) { Modified: branches/setup_improvements/base/system/userinit/resource.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/resource.h [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/resource.h [iso-8859-1] Sat Jul 8 00:04:21 2017 @@ -4,6 +4,7 @@ /* Bitmaps */ #define IDB_ROSLOGO 100 +#define IDB_ROSMASK 101 #define IDC_STATIC -1 Modified: branches/setup_improvements/base/system/userinit/userinit.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/userinit.h [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/userinit.h [iso-8859-1] Sat Jul 8 00:04:21 2017 @@ -48,6 +48,8 @@ HBITMAP hBitmap; INT cxSource; INT cySource; + INT iPlanes; + INT iBits; } IMGINFO, *PIMGINFO; typedef struct Modified: branches/setup_improvements/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/userinit.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/userinit.rc [iso-8859-1] Sat Jul 8 00:04:21 2017 @@ -3,14 +3,16 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "Userinit Logon Application" -#define REACTOS_STR_INTERNAL_NAME "userinit" -#define REACTOS_STR_ORIGINAL_FILENAME "userinit.dll" +#define REACTOS_STR_FILE_DESCRIPTION "Userinit Logon Application" +#define REACTOS_STR_INTERNAL_NAME "userinit" +#define REACTOS_STR_ORIGINAL_FILENAME "userinit.exe" #include <reactos/version.rc> + +#include <reactos/manifest_exe.rc> /* Bitmaps */ IDB_ROSLOGO BITMAP "res/rosbitmap.bmp" - +IDB_ROSMASK BITMAP "res/rosbitmap_mask.bmp" /* UTF-8 */ #pragma code_page(65001)

7 years, 5 months

[hbelusca] 75302: [USERINIT]: Add the possibility to quit the UserInit "wizard" via the "Cancel" button, prompting the user for confirmation beforehand. This action restarts the computer. CORE-1353...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jul 7 23:55:06 2017 New Revision: 75302 URL: http://svn.reactos.org/svn/reactos?rev=75302&view=rev Log: [USERINIT]: Add the possibility to quit the UserInit "wizard" via the "Cancel" button, prompting the user for confirmation beforehand. This action restarts the computer. CORE-13530 #resolve Modified: branches/setup_improvements/base/system/userinit/lang/bg-BG.rc branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc branches/setup_improvements/base/system/userinit/lang/de-DE.rc branches/setup_improvements/base/system/userinit/lang/el-GR.rc branches/setup_improvements/base/system/userinit/lang/en-US.rc branches/setup_improvements/base/system/userinit/lang/es-ES.rc branches/setup_improvements/base/system/userinit/lang/fr-FR.rc branches/setup_improvements/base/system/userinit/lang/he-IL.rc branches/setup_improvements/base/system/userinit/lang/hu-HU.rc branches/setup_improvements/base/system/userinit/lang/id-ID.rc branches/setup_improvements/base/system/userinit/lang/it-IT.rc branches/setup_improvements/base/system/userinit/lang/ja-JP.rc branches/setup_improvements/base/system/userinit/lang/lt-LT.rc branches/setup_improvements/base/system/userinit/lang/nl-NL.rc branches/setup_improvements/base/system/userinit/lang/no-NO.rc branches/setup_improvements/base/system/userinit/lang/pl-PL.rc branches/setup_improvements/base/system/userinit/lang/pt-BR.rc branches/setup_improvements/base/system/userinit/lang/ro-RO.rc branches/setup_improvements/base/system/userinit/lang/ru-RU.rc branches/setup_improvements/base/system/userinit/lang/sk-SK.rc branches/setup_improvements/base/system/userinit/lang/sq-AL.rc branches/setup_improvements/base/system/userinit/lang/sv-SE.rc branches/setup_improvements/base/system/userinit/lang/th-TH.rc branches/setup_improvements/base/system/userinit/lang/tr-TR.rc branches/setup_improvements/base/system/userinit/lang/uk-UA.rc branches/setup_improvements/base/system/userinit/lang/zh-CN.rc branches/setup_improvements/base/system/userinit/lang/zh-TW.rc branches/setup_improvements/base/system/userinit/livecd.c branches/setup_improvements/base/system/userinit/resource.h branches/setup_improvements/base/system/userinit/userinit.c branches/setup_improvements/base/system/userinit/userinit.h Modified: branches/setup_improvements/base/system/userinit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/bg-BG.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ userinit Ð½Ðµ ÑÑÐ¿Ñ Ð´Ð° Ð¿ÑÑÐ½Ðµ Ð¾Ð±Ð²Ð¸Ð²ÐºÐ°ÑÐ°!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ userinit Ð½Ðµ ÑÑÐ¿Ñ Ð´Ð° Ð¿ÑÑÐ½Ðµ Ð¾Ð±Ð²Ð¸Ð²ÐºÐ°ÑÐ°!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -6,14 +6,14 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Jazyk:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Jazyk:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "RozvrÅ¾enÃ klÃ¡vesnice:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "RozvrÅ¾enÃ &klÃ¡vesnice:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Vyberte si svÅ¯j jazyk a rozloÅ¾enÃ klÃ¡vesnice a kliknÄtÄ na DalÅ¡Ã.", IDC_STATIC, 7, 152, 300, 8 @@ -23,13 +23,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Spustit &Live CD ReactOS", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Instalovat ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Spustit &Live CD ReactOS", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Instalovat ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -40,8 +40,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho rozhranÃ!\n" - IDS_INSTALLER_FAIL "Aplikaci Userinit se nepodaÅilo spustit instalÃ¡tor!\n" + IDS_SHELL_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho rozhranÃ!" + IDS_INSTALLER_FAIL "Aplikaci Userinit se nepodaÅilo spustit instalÃ¡tor!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/de-DE.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/de-DE.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/el-GR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/el-GR.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "H Userinit Î´Îµ Î¼ÏÏÏÎµÏÎµ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏÎµÎ¹ ÏÎ¿ ÎºÎÎ»ÏÏÎ¿Ï!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "H Userinit Î´Îµ Î¼ÏÏÏÎµÏÎµ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏÎµÎ¹ ÏÎ¿ ÎºÎÎ»ÏÏÎ¿Ï!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/en-US.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/en-US.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit failed to start the shell!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit failed to start the shell!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/es-ES.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/es-ES.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit no pudo iniciar el shell con Ã©xito!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit no pudo iniciar el shell con Ã©xito!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/fr-FR.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,45 +1,46 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "ReactOS LiveCD" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "LiveCD ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Langue :", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "SchÃ©ma du &clavier :", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "SÃ©lectionnez votre langue et le schÃ©ma de clavier, et appuyez sur Suivant pour continuer.", IDC_STATIC, 7, 152, 300, 8 CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 - DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + DEFPUSHBUTTON "&Suivant", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Annuler", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "ReactOS LiveCD" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "LiveCD ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "DÃ©marrer le &Live CD ReactOS", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Installer ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 - PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "&PrÃ©cÃ©dent", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Annuler", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit a Ã©chouÃ© lors du chargement de l'interface (shell) !\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit a Ã©chouÃ© lors du chargement de l'interface (shell) !" + IDS_INSTALLER_FAIL "Userinit a Ã©chouÃ© lors du dÃ©marrage de l'installation !" + IDS_CANCEL_CONFIRM "Ãtes-vous sÃ»r de vouloir quitter le LiveCD ReactOS ?\nSi tel est le cas, votre ordinateur redÃ©marrera certainement." END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "Espagnol (Espagne)" END Modified: branches/setup_improvements/base/system/userinit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/he-IL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/he-IL.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit × ××©× ×××¤×¢×× ××ª ××××©×§!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit × ××©× ×××¤×¢×× ××ª ××××©×§!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/hu-HU.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Az Userinit nem tudja elindÃtani a rendszert!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Az Userinit nem tudja elindÃtani a rendszert!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/id-ID.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/id-ID.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit gagal untuk memulai shell!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit gagal untuk memulai shell!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/it-IT.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/it-IT.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Lingua:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Lingua:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Layout di teastiera:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "Layout di &teastiera:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Selezionare la lingua e il layout di tastiera e premere su Avanti per continuare.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Avvia ReactOS con &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Installa ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Avvia ReactOS con &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Installa ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente grafico!\n" - IDS_INSTALLER_FAIL "Userinit non ha potuto avviare l'installazione!\n" + IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente grafico!" + IDS_INSTALLER_FAIL "Userinit non ha potuto avviare l'installazione!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/ja-JP.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/lt-LT.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/lt-LT.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit nepavyko paleisti aplinkos!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit nepavyko paleisti aplinkos!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/nl-NL.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit kon de shell niet starten!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit kon de shell niet starten!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/no-NO.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/no-NO.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit mislykket Ã¥ starte skall!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit mislykket Ã¥ starte skall!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/pl-PL.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -8,14 +8,14 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -25,13 +25,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -42,8 +42,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez userinit!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez userinit!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/pt-BR.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit falhou ao tentar iniciar o shell!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit falhou ao tentar iniciar o shell!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/ro-RO.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "LimbÄ:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&LimbÄ:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Aranjament tastaturÄ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Aranjament tastaturÄ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "SelectaÈi limba Èi aranjamentul de tastaturÄ apoi apÄsaÈi âÃnainteâ pentru a continua.", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "LanseazÄ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&InstaleazÄ ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "LanseazÄ ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&InstaleazÄ ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit a eÈuat Ã®n lansarea interfeÈei!\n" - IDS_INSTALLER_FAIL "Userinit a eÈuat Ã®n lansarea instalÄrii!\n" + IDS_SHELL_FAIL "Userinit a eÈuat Ã®n lansarea interfeÈei!" + IDS_INSTALLER_FAIL "Userinit a eÈuat Ã®n lansarea instalÄrii!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/ru-RU.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Ð¯Ð·ÑÐº:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Ð¯Ð·ÑÐº:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº Ð¸ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ, Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐÐ°Ð»ÐµÐµ, ÑÑÐ¾Ð±Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!\n" - IDS_INSTALLER_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸!\n" + IDS_SHELL_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!" + IDS_INSTALLER_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/sk-SK.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit zlyhal pri spÃºÅ¡Å¥anÃ shellu!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit zlyhal pri spÃºÅ¡Å¥anÃ shellu!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/sq-AL.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -5,14 +5,14 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -22,13 +22,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -39,8 +39,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit dÃ«shtuar pÃ«r tÃ« filluar shell'in!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit dÃ«shtuar pÃ«r tÃ« filluar shell'in!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/sv-SE.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit misslyckades att starta anvÃ¤ndargrÃ¤nssnittet!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit misslyckades att starta anvÃ¤ndargrÃ¤nssnittet!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/th-TH.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/th-TH.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -1,14 +1,14 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -18,13 +18,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -35,8 +35,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/tr-TR.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,11 +3,11 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS ÃalÄ±Åan CD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 RTEXT "Dil:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP RTEXT "DÃ¼Äme TakÄ±mÄ± DÃ¼zeni:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS ÃalÄ±Åan CD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "&ReactOS ÃalÄ±Åan CD'yi ÃalÄ±ÅtÄ±r", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "R&eactOS'u Kur", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "&ReactOS ÃalÄ±Åan CD'yi ÃalÄ±ÅtÄ±r", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "R&eactOS'u Kur", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit, kabuÄu baÅlatmada baÅarÄ±sÄ±z oldu!\n" - IDS_INSTALLER_FAIL "Userinit, Kur'u baÅlatmada baÅarÄ±sÄ±z oldu!\n" + IDS_SHELL_FAIL "Userinit, kabuÄu baÅlatmada baÅarÄ±sÄ±z oldu!" + IDS_INSTALLER_FAIL "Userinit, Kur'u baÅlatmada baÅarÄ±sÄ±z oldu!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/uk-UA.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -9,14 +9,14 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 @@ -26,13 +26,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -43,8 +43,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ!" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/zh-CN.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "è¯è¨:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "è¯è¨(&L):", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "é®çå¸å±:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "é®çå¸å±(&K):", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "éæ©æ¨çè¯è¨åé®çå¸å±ï¼è¯·åå»ä¸ä¸æ¥ç»§ç»ã", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "è¿è¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "è¿è¡ ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼\n" - IDS_INSTALLER_FAIL "Userinit å¯å¨å®è£ç¨åºå¤±è´¥!\n" + IDS_SHELL_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼" + IDS_INSTALLER_FAIL "Userinit å¯å¨å®è£ç¨åºå¤±è´¥ï¼" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/zh-TW.rc [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -3,14 +3,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "èªè¨:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + RTEXT "èªè¨(&L):", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "éµç¤éç½®:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "éµç¤éç½®(&K):", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "é¸ææ¨çèªè¨åéµç¤éç½®ï¼è«æä¸ä¸ä¸ä¸æ¥ç¹¼çºã", IDC_STATIC, 7, 152, 300, 8 @@ -20,13 +20,13 @@ END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS LiveCD" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "éè¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21 + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99 + DEFPUSHBUTTON "éè¡ ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21 + PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 136, 175, 21 // LTEXT "", IDC_STATIC, 7, 152, 300, 8 @@ -37,8 +37,9 @@ STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼\n" - IDS_INSTALLER_FAIL "Userinit ååå®è£ç¨å¼å¤±æ!\n" + IDS_SHELL_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼" + IDS_INSTALLER_FAIL "Userinit ååå®è£ç¨å¼å¤±æï¼" + IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart." END STRINGTABLE Modified: branches/setup_improvements/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/livecd.c [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/livecd.c [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -564,9 +564,6 @@ /* Fill the language and keyboard layout lists */ CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); CreateKeyboardLayoutList(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); - - /* Disable the 'Cancel' button*/ - EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); return FALSE; case WM_DRAWITEM: @@ -631,13 +628,29 @@ /* Set the locale for the current thread */ NtSetDefaultLocale(TRUE, NewLcid); - /* Store the locale setings in the registry */ + /* Store the locale settings in the registry */ InitializeDefaultUserLocale(&NewLcid); SetKeyboardLayout(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); pState->NextPage = STARTPAGE; - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, LOWORD(wParam)); + } + break; + + case IDCANCEL: + if (HIWORD(wParam) == BN_CLICKED) + { + static WCHAR szMsg[RC_STRING_MAX_SIZE]; + INT ret; + LoadStringW(GetModuleHandle(NULL), IDS_CANCEL_CONFIRM, szMsg, ARRAYSIZE(szMsg)); + ret = MessageBoxW(hwndDlg, szMsg, L"ReactOS LiveCD", MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2); + if (ret == IDOK || ret == IDYES) + { + pState->NextPage = DONE; + pState->Run = REBOOT; + EndDialog(hwndDlg, LOWORD(wParam)); + } } break; @@ -677,8 +690,6 @@ /* Center the dialog window */ CenterWindow(hwndDlg); - - EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); return FALSE; case WM_DRAWITEM: @@ -695,18 +706,34 @@ case IDC_RUN: pState->NextPage = DONE; pState->Run = SHELL; - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, LOWORD(wParam)); break; case IDC_INSTALL: pState->NextPage = DONE; pState->Run = INSTALLER; - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, LOWORD(wParam)); break; case IDOK: pState->NextPage = LOCALEPAGE; - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, LOWORD(wParam)); + break; + + case IDCANCEL: + if (HIWORD(wParam) == BN_CLICKED) + { + static WCHAR szMsg[RC_STRING_MAX_SIZE]; + INT ret; + LoadStringW(GetModuleHandle(NULL), IDS_CANCEL_CONFIRM, szMsg, ARRAYSIZE(szMsg)); + ret = MessageBoxW(hwndDlg, szMsg, L"ReactOS LiveCD", MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2); + if (ret == IDOK || ret == IDYES) + { + pState->NextPage = DONE; + pState->Run = REBOOT; + EndDialog(hwndDlg, LOWORD(wParam)); + } + } break; default: Modified: branches/setup_improvements/base/system/userinit/resource.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/resource.h [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/resource.h [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -26,8 +26,6 @@ /* Strings */ #define IDS_SHELL_FAIL 600 #define IDS_INSTALLER_FAIL 601 - - - +#define IDS_CANCEL_CONFIRM 602 #define IDS_SPAIN 3900 Modified: branches/setup_improvements/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/userinit.c [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/userinit.c [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -570,6 +570,34 @@ return TRUE; } +/* Used to get the shutdown privilege */ +static BOOL +EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) +{ + BOOL Success; + HANDLE hToken; + TOKEN_PRIVILEGES tp; + + Success = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken); + if (!Success) return Success; + + Success = LookupPrivilegeValueW(NULL, + lpszPrivilegeName, + &tp.Privileges[0].Luid); + if (!Success) goto Quit; + + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + + Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); + +Quit: + CloseHandle(hToken); + return Success; +} + int WINAPI wWinMain(IN HINSTANCE hInst, @@ -603,15 +631,30 @@ RunLiveCD(&State); } - if (State.Run == SHELL) - { - Success = StartShell(); - if (Success) - NotifyLogon(); - } - else if (State.Run == INSTALLER) - { - Success = StartInstaller(); + switch (State.Run) + { + case SHELL: + Success = StartShell(); + if (Success) + NotifyLogon(); + break; + + case INSTALLER: + Success = StartInstaller(); + break; + + case REBOOT: + { + EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + ExitWindowsEx(EWX_REBOOT, 0); + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); + Success = TRUE; + break; + } + + default: + Success = FALSE; + break; } /* Modified: branches/setup_improvements/base/system/userinit/userinit.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/userinit.h [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/userinit.h [iso-8859-1] Fri Jul 7 23:55:06 2017 @@ -39,7 +39,8 @@ typedef enum { SHELL, - INSTALLER + INSTALLER, + REBOOT } RUN; typedef struct _IMGINFO

7 years, 5 months

[gadamopoulos] 75301: [SHELL32] - Simplify SHELL32_CoCreateInitSF by letting the callers fill the PERSIST_FOLDER_TARGET_INFO. This lets us stop using _ILSimpleGetTextW in it which breaks the logic ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jul 7 20:34:27 2017 New Revision: 75301 URL: http://svn.reactos.org/svn/reactos?rev=75301&view=rev Log: [SHELL32] - Simplify SHELL32_CoCreateInitSF by letting the callers fill the PERSIST_FOLDER_TARGET_INFO. This lets us stop using _ILSimpleGetTextW in it which breaks the logic that pidls should be read only by their shell folder. Also add an overload for SHELL32_CoCreateInitSF that makes it simpler to create a shell folder with a csidl. - Add a SHELL32_BindToSF helper to share some logic that was duplicated in several shell folders. - Move SHELL32_GetCustomFolderAttributeFromPath, SHELL32_GetCLSIDForDirectory and SHELL32_GetFSItemAttributes, SHELL32_BindToFS to CFSFolder.cpp as these were fs specific. - These changes give finer control to shell folders for how the bind will be done and shares more logic that can be shared. Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -175,8 +175,6 @@ return E_OUTOFMEMORY; return SHELL32_CoCreateInitSF(m_pidlInner, - NULL, - NULL, &CLSID_ShellFSFolder, CSIDL_COMMON_ADMINTOOLS, IID_PPV_ARG(IShellFolder2, &m_pisfInner)); Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -270,8 +270,6 @@ /* Create the inner fs folder */ hr = SHELL32_CoCreateInitSF(pidlRoot, - NULL, - NULL, &CLSID_ShellFSFolder, CSIDL_DESKTOPDIRECTORY, IID_PPV_ARG(IShellFolder2, &m_DesktopFSFolder)); @@ -280,8 +278,6 @@ /* Create the inner shared fs folder. Dont fail on failure. */ hr = SHELL32_CoCreateInitSF(pidlRoot, - NULL, - NULL, &CLSID_ShellFSFolder, CSIDL_COMMON_DESKTOPDIRECTORY, IID_PPV_ARG(IShellFolder2, &m_SharedDesktopFSFolder)); Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -390,31 +390,25 @@ if (_ILIsSpecialFolder(pidl)) return m_regFolder->BindToObject(pidl, pbcReserved, riid, ppvOut); - LPITEMIDLIST pidlChild = ILCloneFirst (pidl); - if (!pidlChild) - return E_OUTOFMEMORY; - - CComPtr<IShellFolder> psf; - HRESULT hr = SHELL32_CoCreateInitSF(pidlRoot, - NULL, - pidlChild, - &CLSID_ShellFSFolder, - -1, - IID_PPV_ARG(IShellFolder, &psf)); - - ILFree(pidlChild); - - if (FAILED(hr)) + CHAR* pchDrive = _ILGetDataPointer(pidl)->u.drive.szDriveName; + + PERSIST_FOLDER_TARGET_INFO pfti = {0}; + pfti.dwAttributes = -1; + pfti.csidl = -1; + pfti.szTargetParsingName[0] = *pchDrive; + pfti.szTargetParsingName[1] = L':'; + pfti.szTargetParsingName[2] = L'\\'; + + HRESULT hr = SHELL32_BindToSF(pidlRoot, + &pfti, + pidl, + &CLSID_ShellFSFolder, + riid, + ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - if (_ILIsPidlSimple (pidl)) - { - return psf->QueryInterface(riid, ppvOut); - } - else - { - return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); - } + return S_OK; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -128,6 +128,110 @@ } return pidl; +} + +void SHELL32_GetCLSIDForDirectory(LPCWSTR pwszDir, CLSID* pclsidFolder) +{ + WCHAR wszCLSIDValue[CHARS_IN_GUID]; + WCHAR wszDesktopIni[MAX_PATH]; + StringCchCopyW(wszDesktopIni, MAX_PATH, pwszDir); + StringCchCatW(wszDesktopIni, MAX_PATH, L"\\desktop.ini"); + + if (GetPrivateProfileStringW(L".ShellClassInfo", + L"CLSID", + L"", + wszCLSIDValue, + CHARS_IN_GUID, + wszDesktopIni)) + { + CLSIDFromString (wszCLSIDValue, pclsidFolder); + } +} + + +static const DWORD dwSupportedAttr= + SFGAO_CANCOPY | /*0x00000001 */ + SFGAO_CANMOVE | /*0x00000002 */ + SFGAO_CANLINK | /*0x00000004 */ + SFGAO_CANRENAME | /*0x00000010 */ + SFGAO_CANDELETE | /*0x00000020 */ + SFGAO_HASPROPSHEET | /*0x00000040 */ + SFGAO_DROPTARGET | /*0x00000100 */ + SFGAO_LINK | /*0x00010000 */ + SFGAO_READONLY | /*0x00040000 */ + SFGAO_HIDDEN | /*0x00080000 */ + SFGAO_FILESYSANCESTOR | /*0x10000000 */ + SFGAO_FOLDER | /*0x20000000 */ + SFGAO_FILESYSTEM | /*0x40000000 */ + SFGAO_HASSUBFOLDER; /*0x80000000 */ + +HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + DWORD dwFileAttributes, dwShellAttributes; + + if (!_ILIsFolder(pidl) && !_ILIsValue(pidl)) + { + ERR("Got wrong type of pidl!\n"); + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; + } + + if (*pdwAttributes & ~dwSupportedAttr) + { + WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); + *pdwAttributes &= dwSupportedAttr; + } + + dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0); + + /* Set common attributes */ + dwShellAttributes = *pdwAttributes; + dwShellAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | + SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; + + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + dwShellAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + } + else + dwShellAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + + if (dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + dwShellAttributes |= SFGAO_HIDDEN; + else + dwShellAttributes &= ~SFGAO_HIDDEN; + + if (dwFileAttributes & FILE_ATTRIBUTE_READONLY) + dwShellAttributes |= SFGAO_READONLY; + else + dwShellAttributes &= ~SFGAO_READONLY; + + if (SFGAO_LINK & *pdwAttributes) + { + char ext[MAX_PATH]; + + if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) + dwShellAttributes &= ~SFGAO_LINK; + } + + if (SFGAO_HASSUBFOLDER & *pdwAttributes) + { + CComPtr<IShellFolder> psf2; + if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) + { + CComPtr<IEnumIDList> pEnumIL; + if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) + { + if (pEnumIL->Skip(1) != S_OK) + dwShellAttributes &= ~SFGAO_HASSUBFOLDER; + } + } + } + + *pdwAttributes &= dwShellAttributes; + + TRACE ("-- 0x%08x\n", *pdwAttributes); + return S_OK; } /************************************************************************** @@ -274,7 +378,48 @@ TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbc, shdebugstr_guid(&riid), ppvOut); - return SHELL32_BindToFS(pidlRoot, sPathTarget, pidl, riid, ppvOut); + CComPtr<IShellFolder> pSF; + HRESULT hr; + + if (!pidlRoot || !ppvOut || !pidl || !pidl->mkid.cb) + return E_INVALIDARG; + + if (_ILIsValue(pidl)) + { + ERR("Binding to file is unimplemented\n"); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + if (!_ILIsFolder(pidl)) + { + ERR("Got an unknown type of pidl!\n"); + return E_FAIL; + } + + *ppvOut = NULL; + + /* Get the pidl data */ + FileStruct* pData = &_ILGetDataPointer(pidl)->u.file; + FileStructW* pDataW = _ILGetFileStructW(pidl); + + /* Create the target folder info */ + PERSIST_FOLDER_TARGET_INFO pfti = {0}; + pfti.dwAttributes = -1; + pfti.csidl = -1; + PathCombineW(pfti.szTargetParsingName, sPathTarget, pDataW->wszName); + + /* Get the CLSID to bind to */ + CLSID clsidFolder = CLSID_ShellFSFolder; + if ((pData->uFileAttribs & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0) + SHELL32_GetCLSIDForDirectory(pfti.szTargetParsingName, &clsidFolder); + + hr = SHELL32_BindToSF(pidlRoot, &pfti, pidl, &clsidFolder, riid, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + TRACE ("-- returning (%p) %08x\n", *ppvOut, hr); + + return S_OK; + } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -175,9 +175,7 @@ if (!m_pidlInner) return E_OUTOFMEMORY; - return SHELL32_CoCreateInitSF(m_pidlInner, - NULL, - NULL, + return SHELL32_CoCreateInitSF(m_pidlInner, &CLSID_ShellFSFolder, CSIDL_FONTS, IID_PPV_ARG(IShellFolder2, &m_pisfInner)); Modified: trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -175,8 +175,6 @@ return E_OUTOFMEMORY; return SHELL32_CoCreateInitSF(m_pidlInner, - NULL, - NULL, &CLSID_ShellFSFolder, CSIDL_PERSONAL, IID_PPV_ARG(IShellFolder2, &m_pisfInner)); Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -283,31 +283,13 @@ HRESULT WINAPI CNetFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { #ifdef HACKY_UNC_PATHS - PITEMID_CHILD pidlChild = ILCloneFirst (pidl); - if (!pidlChild) - return E_FAIL; - - PIDLIST_ABSOLUTE pidlAbsolute = ILCombine(pidlRoot,pidlChild); - if (!pidlAbsolute) - return E_FAIL; - - CComPtr<IShellFolder> psf; - HRESULT hr = SHELL32_CoCreateInitSF(pidlAbsolute, - (WCHAR*)pidl->mkid.abID, - NULL, - &CLSID_ShellFSFolder, - -1, - IID_PPV_ARG(IShellFolder, &psf)); - ILFree(pidlChild); - ILFree(pidlAbsolute); - - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - if (_ILIsPidlSimple (pidl)) - return psf->QueryInterface(riid, ppvOut); - else - return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); + /* Create the target folder info */ + PERSIST_FOLDER_TARGET_INFO pfti = {0}; + pfti.dwAttributes = -1; + pfti.csidl = -1; + StringCchCopyW(pfti.szTargetParsingName, MAX_PATH, (WCHAR*)pidl->mkid.abID); + + return SHELL32_BindToSF(pidlRoot, &pfti, pidl, &CLSID_ShellFSFolder, riid, ppvOut); #else return E_NOTIMPL; #endif Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -339,24 +339,11 @@ return E_INVALIDARG; } - LPITEMIDLIST pidlChild = ILCloneFirst (pidl); - if (!pidlChild) - return E_OUTOFMEMORY; - - CComPtr<IShellFolder> psf; - hr = SHELL32_CoCreateInitSF(m_pidlRoot, NULL, pidlChild, pGUID, -1, IID_PPV_ARG(IShellFolder, &psf)); - ILFree(pidlChild); - if (FAILED(hr)) + hr = SHELL32_BindToSF(m_pidlRoot, NULL, pidl, pGUID, riid, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - if (_ILIsPidlSimple (pidl)) - { - return psf->QueryInterface(riid, ppvOut); - } - else - { - return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); - } + return S_OK; } HRESULT WINAPI CRegFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -485,7 +472,14 @@ } else { - return HCR_GetClassName(m_guid, strRet); + BOOL bRet; + WCHAR wstrName[MAX_PATH+1]; + bRet = HCR_GetClassNameW(m_guid, wstrName, MAX_PATH); + if (!bRet) + return E_FAIL; + + return SHSetStrRet(strRet, wstrName); + } } Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -40,12 +40,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes); -HRESULT HCR_GetClassName(REFIID riid, LPSTRRET strRet); - HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - -HRESULT SHELL32_BindToFS (LPCITEMIDLIST pidlRoot, - LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); @@ -55,8 +50,16 @@ HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); -HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, - LPCITEMIDLIST pidlChild, const GUID* clsid, int csidl, REFIID riid, LPVOID *ppvOut); +#ifdef __cplusplus +HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* ppfti, + LPCITEMIDLIST pidlChild, const GUID* clsid, REFIID riid, LPVOID *ppvOut); + +HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, const GUID* clsid, + int csidl, REFIID riid, LPVOID *ppvOut); +#endif + +HRESULT SHELL32_BindToSF (LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* ppfti, + LPCITEMIDLIST pidl, const GUID* clsid, REFIID riid, LPVOID *ppvOut); extern "C" BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey); Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Fri Jul 7 20:34:27 2017 @@ -24,37 +24,6 @@ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/*************************************************************************** - * SHELL32_GetCustomFolderAttributeFromPath (internal function) - * - * Gets a value from the folder's desktop.ini file, if one exists. - * - * PARAMETERS - * pwszFolderPath[I] Folder containing the desktop.ini file. - * pwszHeading [I] Heading in .ini file. - * pwszAttribute [I] Attribute in .ini file. - * pwszValue [O] Buffer to store value into. - * cchValue [I] Size in characters including NULL of buffer pointed to - * by pwszValue. - * - * RETURNS - * TRUE if returned non-NULL value. - * FALSE otherwise. - */ -static BOOL __inline SHELL32_GetCustomFolderAttributeFromPath( - LPWSTR pwszFolderPath, LPCWSTR pwszHeading, LPCWSTR pwszAttribute, - LPWSTR pwszValue, DWORD cchValue) -{ - static const WCHAR wszDesktopIni[] = - {'d','e','s','k','t','o','p','.','i','n','i',0}; - static const WCHAR wszDefault[] = {0}; - - PathAddBackslashW(pwszFolderPath); - PathAppendW(pwszFolderPath, wszDesktopIni); - return GetPrivateProfileStringW(pwszHeading, pwszAttribute, wszDefault, - pwszValue, cchValue, pwszFolderPath); -} /*************************************************************************** * GetNextElement (internal function) @@ -148,13 +117,11 @@ * pathRoot can be NULL for Folders being a drive. * In this case the absolute path is built from pidlChild (eg. C:) */ -HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, - LPCITEMIDLIST pidlChild, const GUID* clsid, int csidl, REFIID riid, LPVOID *ppvOut) +HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* ppfti, + LPCITEMIDLIST pidlChild, const GUID* clsid, REFIID riid, LPVOID *ppvOut) { HRESULT hr; CComPtr<IShellFolder> pShellFolder; - - TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); hr = SHCoCreateInstance(NULL, clsid, NULL, IID_PPV_ARG(IShellFolder, &pShellFolder)); if (FAILED(hr)) @@ -164,32 +131,9 @@ CComPtr<IPersistFolder> ppf; CComPtr<IPersistFolder3> ppf3; - if (SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)))) - { - PERSIST_FOLDER_TARGET_INFO ppfti; - - ZeroMemory (&ppfti, sizeof (ppfti)); - - /* fill the PERSIST_FOLDER_TARGET_INFO */ - ppfti.dwAttributes = -1; - ppfti.csidl = csidl; - - /* build path */ - if (pathRoot) - { - lstrcpynW (ppfti.szTargetParsingName, pathRoot, MAX_PATH - 1); - PathAddBackslashW(ppfti.szTargetParsingName); /* FIXME: why have drives a backslash here ? */ - } - - if (pidlChild) - { - int len = wcslen(ppfti.szTargetParsingName); - - if (!_ILSimpleGetTextW(pidlChild, ppfti.szTargetParsingName + len, MAX_PATH - len)) - hr = E_INVALIDARG; - } - - ppf3->InitializeEx(NULL, pidlAbsolute, &ppfti); + if (ppfti && SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)))) + { + ppf3->InitializeEx(NULL, pidlAbsolute, ppfti); } else if (SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder, &ppf)))) { @@ -200,91 +144,39 @@ return pShellFolder->QueryInterface(riid, ppvOut); } -void SHELL32_GetCLSIDForDirectory(LPCWSTR pathRoot, LPCITEMIDLIST pidl, CLSID* pclsidFolder) -{ - static const WCHAR wszDotShellClassInfo[] = { - '.','S','h','e','l','l','C','l','a','s','s','I','n','f','o',0 }; - static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; - WCHAR wszCLSIDValue[CHARS_IN_GUID], wszFolderPath[MAX_PATH], *pwszPathTail = wszFolderPath; - - /* see if folder CLSID should be overridden by desktop.ini file */ - if (pathRoot) { - lstrcpynW(wszFolderPath, pathRoot, MAX_PATH); - pwszPathTail = PathAddBackslashW(wszFolderPath); - } - - _ILSimpleGetTextW(pidl,pwszPathTail,MAX_PATH - (int)(pwszPathTail - wszFolderPath)); - - if (SHELL32_GetCustomFolderAttributeFromPath (wszFolderPath, - wszDotShellClassInfo, wszCLSID, wszCLSIDValue, CHARS_IN_GUID)) - CLSIDFromString (wszCLSIDValue, pclsidFolder); -} - -/*********************************************************************** - * SHELL32_BindToFS [Internal] - * - * Common code for IShellFolder_BindToObject. - * - * PARAMS - * pidlRoot [I] The parent shell folder's absolute pidl. - * pathRoot [I] Absolute dos path of the parent shell folder. - * pidlComplete [I] PIDL of the child. Relative to pidlRoot. - * riid [I] GUID of the interface, which ppvOut shall be bound to. - * ppvOut [O] A reference to the child's interface (riid). - * - * NOTES - * pidlComplete has to contain at least one non empty SHITEMID. - * This function makes special assumptions on the shell namespace, which - * means you probably can't use it for your IShellFolder implementation. - */ -HRESULT SHELL32_BindToFS (LPCITEMIDLIST pidlRoot, - LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) -{ - CComPtr<IShellFolder> pSF; - HRESULT hr; - LPCITEMIDLIST pidlChild; - - if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb) - return E_INVALIDARG; - - if (_ILIsValue(pidlComplete)) - { - ERR("Binding to file is unimplemented\n"); - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - } - if (!_ILIsFolder(pidlComplete)) - { - ERR("Got an unknown type of pidl!\n"); +HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, const GUID* clsid, + int csidl, REFIID riid, LPVOID *ppvOut) +{ + /* fill the PERSIST_FOLDER_TARGET_INFO */ + PERSIST_FOLDER_TARGET_INFO pfti = {0}; + pfti.dwAttributes = -1; + pfti.csidl = csidl; + + return SHELL32_CoCreateInitSF(pidlRoot, &pfti, NULL, clsid, riid, ppvOut); +} + +HRESULT SHELL32_BindToSF (LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* ppfti, + LPCITEMIDLIST pidl, const GUID* clsid, REFIID riid, LPVOID *ppvOut) +{ + PITEMID_CHILD pidlChild = ILCloneFirst (pidl); + if (!pidlChild) return E_FAIL; - } - - *ppvOut = NULL; - - pidlChild = (_ILIsPidlSimple (pidlComplete)) ? pidlComplete : ILCloneFirst (pidlComplete); - - CLSID clsidFolder = CLSID_ShellFSFolder; - DWORD attributes = _ILGetFileAttributes(ILFindLastID(pidlChild), NULL, 0); - if ((attributes & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0) - SHELL32_GetCLSIDForDirectory(pathRoot, pidlChild, &clsidFolder); - - hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, &clsidFolder, -1, IID_PPV_ARG(IShellFolder, &pSF)); - - if (pidlChild != pidlComplete) - ILFree ((LPITEMIDLIST)pidlChild); - - if (SUCCEEDED (hr)) { - if (_ILIsPidlSimple (pidlComplete)) { - /* no sub folders */ - hr = pSF->QueryInterface(riid, ppvOut); - } else { - /* go deeper */ - hr = pSF->BindToObject(ILGetNext (pidlComplete), NULL, riid, ppvOut); - } - } - - TRACE ("-- returning (%p) %08x\n", *ppvOut, hr); - - return hr; + + CComPtr<IShellFolder> psf; + HRESULT hr = SHELL32_CoCreateInitSF(pidlRoot, + ppfti, + pidlChild, + clsid, + IID_PPV_ARG(IShellFolder, &psf)); + ILFree(pidlChild); + + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (_ILIsPidlSimple (pidl)) + return psf->QueryInterface(riid, ppvOut); + else + return psf->BindToObject(ILGetNext (pidl), NULL, riid, ppvOut); } /*********************************************************************** @@ -317,122 +209,6 @@ ILFree (pidlFirst); return hr; -} - -HRESULT HCR_GetClassName(REFIID riid, LPSTRRET strRet) -{ - BOOL bRet; - WCHAR wstrName[MAX_PATH+1]; - bRet = HCR_GetClassNameW(riid, wstrName, MAX_PATH); - if (!bRet) - return E_FAIL; - - return SHSetStrRet(strRet, wstrName); -} - -/*********************************************************************** - * SHELL32_GetItemAttributes - * - * NOTES - * Observed values: - * folder: 0xE0000177 FILESYSTEM | HASSUBFOLDER | FOLDER - * file: 0x40000177 FILESYSTEM - * drive: 0xf0000144 FILESYSTEM | HASSUBFOLDER | FOLDER | FILESYSANCESTOR - * mycomputer: 0xb0000154 HASSUBFOLDER | FOLDER | FILESYSANCESTOR - * (seems to be default for shell extensions if no registry entry exists) - * - * win2k: - * folder: 0xF0400177 FILESYSTEM | HASSUBFOLDER | FOLDER | FILESYSANCESTOR | CANMONIKER - * file: 0x40400177 FILESYSTEM | CANMONIKER - * drive 0xF0400154 FILESYSTEM | HASSUBFOLDER | FOLDER | FILESYSANCESTOR | CANMONIKER | CANRENAME (LABEL) - * - * According to the MSDN documentation this function should not set flags. It claims only to reset flags when necessary. - * However it turns out the native shell32.dll _sets_ flags in several cases - so do we. - */ - -static const DWORD dwSupportedAttr= - SFGAO_CANCOPY | /*0x00000001 */ - SFGAO_CANMOVE | /*0x00000002 */ - SFGAO_CANLINK | /*0x00000004 */ - SFGAO_CANRENAME | /*0x00000010 */ - SFGAO_CANDELETE | /*0x00000020 */ - SFGAO_HASPROPSHEET | /*0x00000040 */ - SFGAO_DROPTARGET | /*0x00000100 */ - SFGAO_LINK | /*0x00010000 */ - SFGAO_READONLY | /*0x00040000 */ - SFGAO_HIDDEN | /*0x00080000 */ - SFGAO_FILESYSANCESTOR | /*0x10000000 */ - SFGAO_FOLDER | /*0x20000000 */ - SFGAO_FILESYSTEM | /*0x40000000 */ - SFGAO_HASSUBFOLDER; /*0x80000000 */ - -HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) -{ - DWORD dwFileAttributes, dwShellAttributes; - - if (!_ILIsFolder(pidl) && !_ILIsValue(pidl)) - { - ERR("Got wrong type of pidl!\n"); - *pdwAttributes &= SFGAO_CANLINK; - return S_OK; - } - - if (*pdwAttributes & ~dwSupportedAttr) - { - WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); - *pdwAttributes &= dwSupportedAttr; - } - - dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0); - - /* Set common attributes */ - dwShellAttributes = *pdwAttributes; - dwShellAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | - SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; - - if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - dwShellAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - } - else - dwShellAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - - if (dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - dwShellAttributes |= SFGAO_HIDDEN; - else - dwShellAttributes &= ~SFGAO_HIDDEN; - - if (dwFileAttributes & FILE_ATTRIBUTE_READONLY) - dwShellAttributes |= SFGAO_READONLY; - else - dwShellAttributes &= ~SFGAO_READONLY; - - if (SFGAO_LINK & *pdwAttributes) - { - char ext[MAX_PATH]; - - if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) - dwShellAttributes &= ~SFGAO_LINK; - } - - if (SFGAO_HASSUBFOLDER & *pdwAttributes) - { - CComPtr<IShellFolder> psf2; - if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) - { - CComPtr<IEnumIDList> pEnumIL; - if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) - { - if (pEnumIL->Skip(1) != S_OK) - dwShellAttributes &= ~SFGAO_HASSUBFOLDER; - } - } - } - - *pdwAttributes &= dwShellAttributes; - - TRACE ("-- 0x%08x\n", *pdwAttributes); - return S_OK; } HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)

7 years, 5 months

[ekohl] 75300: [NETAPI32] - Add DsMergeForestTrustInformationW stub. - Implement DsGetForestTrustInformationW. [SDK/INCLUDE] Add DsGetSiteNameA/W, DsGetForestTrustInformationW and DsMergeForestTrus...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jul 7 17:59:14 2017 New Revision: 75300 URL: http://svn.reactos.org/svn/reactos?rev=75300&view=rev Log: [NETAPI32] - Add DsMergeForestTrustInformationW stub. - Implement DsGetForestTrustInformationW. [SDK/INCLUDE] Add DsGetSiteNameA/W, DsGetForestTrustInformationW and DsMergeForestTrustInformationW prototypes to dsgetdc.h. Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/netlogon.c trunk/reactos/sdk/include/psdk/dsgetdc.h Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Fri Jul 7 17:59:14 2017 @@ -18,10 +18,10 @@ @ stub DsGetDcOpenW @ stdcall DsGetDcSiteCoverageA(str ptr str) @ stdcall DsGetDcSiteCoverageW(wstr ptr wstr) -@ stub DsGetForestTrustInformationW +@ stdcall DsGetForestTrustInformationW(wstr wstr long ptr) @ stdcall DsGetSiteNameA(str str) @ stdcall DsGetSiteNameW(wstr wstr) -@ stub DsMergeForestTrustInformationW +@ stdcall DsMergeForestTrustInformationW(wstr ptr ptr ptr) @ stub DsRoleAbortDownlevelServerUpgrade @ stub DsRoleCancel @ stub DsRoleDcAsDc Modified: trunk/reactos/dll/win32/netapi32/netlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netlogo… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netlogon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netlogon.c [iso-8859-1] Fri Jul 7 17:59:14 2017 @@ -170,8 +170,7 @@ { FIXME("DsEnumerateDomainTrustsA(%s, %x, %p, %p)\n", debugstr_a(ServerName), Flags, Domains, DomainCount); - - return ERROR_NO_LOGON_SERVERS; + return ERROR_CALL_NOT_IMPLEMENTED; } @@ -185,8 +184,7 @@ { FIXME("DsEnumerateDomainTrustsW(%s, %x, %p, %p)\n", debugstr_w(ServerName), Flags, Domains, DomainCount); - - return ERROR_NO_LOGON_SERVERS; + return ERROR_CALL_NOT_IMPLEMENTED; } @@ -203,7 +201,6 @@ FIXME("DsGetDcNameA(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_a(ComputerName), debugstr_a(DomainName), debugstr_guid(DomainGuid), debugstr_a(SiteName), Flags, DomainControllerInfo); - return ERROR_CALL_NOT_IMPLEMENTED; } @@ -250,7 +247,7 @@ ULONG BufferSize, i; NET_API_STATUS status; - TRACE("DsGetDcSiteCoverageA(%s, %p, %p)\n", + TRACE("DsGetDcSiteCoverageW(%s, %p, %p)\n", debugstr_w(ServerName), EntryCount, SiteNames); *EntryCount = 0; @@ -308,6 +305,37 @@ DWORD WINAPI +DsGetForestTrustInformationW( + _In_opt_ LPCWSTR ServerName, + _In_opt_ LPCWSTR TrustedDomainName, + _In_ DWORD Flags, + _Out_ PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo) +{ + NET_API_STATUS status; + + TRACE("DsGetForestTrustInformationW(%s, %s, 0x%08lx, %p)\n", + debugstr_w(ServerName), debugstr_w(TrustedDomainName), + Flags, ForestTrustInfo); + + RpcTryExcept + { + status = DsrGetForestTrustInformation((PWSTR)ServerName, + (PWSTR)TrustedDomainName, + Flags, + ForestTrustInfo); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +DWORD +WINAPI DsGetSiteNameA( _In_ LPCSTR ComputerName, _Out_ LPSTR *SiteName) @@ -341,6 +369,21 @@ RpcEndExcept; return status; +} + + +DWORD +WINAPI +DsMergeForestTrustInformationW( + _In_ LPCWSTR DomainName, + _In_ PLSA_FOREST_TRUST_INFORMATION NewForestTrustInfo, + _In_opt_ PLSA_FOREST_TRUST_INFORMATION OldForestTrustInfo, + _Out_ PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo) +{ + FIXME("DsMergeForestTrustInformationW(%s, %p, %p, %p)\n", + debugstr_w(DomainName), NewForestTrustInfo, + OldForestTrustInfo, ForestTrustInfo); + return ERROR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/sdk/include/psdk/dsgetdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/dsgetdc.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/dsgetdc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/dsgetdc.h [iso-8859-1] Fri Jul 7 17:59:14 2017 @@ -138,6 +138,34 @@ PULONG EntryCount, LPWSTR **SiteNames); +DWORD +WINAPI +DsGetForestTrustInformationW( + LPCWSTR ServerName, + LPCWSTR TrustedDomainName, + DWORD Flags, + PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo); + +DWORD +WINAPI +DsGetSiteNameA( + LPCSTR ComputerName, + LPSTR *SiteName); + +DWORD +WINAPI +DsGetSiteNameW( + LPCWSTR ComputerName, + LPWSTR *SiteName); + +DWORD +WINAPI +DsMergeForestTrustInformationW( + LPCWSTR DomainName, + PLSA_FOREST_TRUST_INFORMATION NewForestTrustInfo, + PLSA_FOREST_TRUST_INFORMATION OldForestTrustInfo, + PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo); + #ifdef UNICODE typedef DOMAIN_CONTROLLER_INFOW DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO; typedef DS_DOMAIN_TRUSTSW DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS; @@ -146,6 +174,7 @@ #define DsEnumerateDomainTrusts DsEnumerateDomainTrustsW #define DsGetDcName DsGetDcNameW #define DsGetDcSiteCoverage DsGetDcSiteCoverageW +#define DsGetSiteName DsGetSiteNameW #else typedef DOMAIN_CONTROLLER_INFOA DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO; typedef DS_DOMAIN_TRUSTSA DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS; @@ -154,6 +183,7 @@ #define DsEnumerateDomainTrusts DsEnumerateDomainTrustsA #define DsGetDcName DsGetDcNameA #define DsGetDcSiteCoverage DsGetDcSiteCoverageA +#define DsGetSiteName DsGetSiteNameA #endif #ifdef __cplusplus

7 years, 5 months

[ssawant] 75299: [QCKLNCH] -Fixed a memory leak issue. -Apparently Tested in xpvm. -Needs further testing.

by ssawant＠svn.reactos.org

Author: ssawant Date: Fri Jul 7 16:38:37 2017 New Revision: 75299 URL: http://svn.reactos.org/svn/reactos?rev=75299&view=rev Log: [QCKLNCH] -Fixed a memory leak issue. -Apparently Tested in xpvm. -Needs further testing. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Fri Jul 7 16:38:37 2017 @@ -169,16 +169,11 @@ { ShowWindow(SW_HIDE); - CComPtr<IEnumIDList> pEndl; - LPITEMIDLIST pidl; - HRESULT hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pEndl); - if (FAILED_UNEXPECTEDLY(hr)) - { - DestroyWindow(); - return hr; - } - while (pEndl->Next(1, &pidl, NULL) != S_FALSE) - CoTaskMemFree(pidl); + TBBUTTON tb; + for (int i = 0; SendMessage(m_hWnd, TB_GETBUTTON, i, (LPARAM)&tb); i++) + { + CoTaskMemFree((LPITEMIDLIST)tb.dwData); + } DestroyWindow(); m_hWnd = NULL;

7 years, 5 months

[ssawant] 75298: [QCKLNCH] -Apparently fixed some memory leaks. -Removed unnecessary methods. -Fixed a checkmark bug. :p -And thus finished any remaining issues of CR-122. CR-122 (https://code.reac...

by ssawant＠svn.reactos.org

Author: ssawant Date: Fri Jul 7 16:13:47 2017 New Revision: 75298 URL: http://svn.reactos.org/svn/reactos?rev=75298&view=rev Log: [QCKLNCH] -Apparently fixed some memory leaks. -Removed unnecessary methods. -Fixed a checkmark bug. :p -And thus finished any remaining issues of CR-122. CR-122 (https://code.reactos.org/cru/CR-122#details) PS: Please raise any other issues which you feel needs correction. I am waiting... ;D Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Fri Jul 7 16:13:47 2017 @@ -33,7 +33,8 @@ } CISFBand::~CISFBand() -{ +{ + CloseDW(0); } // Toolbar @@ -62,8 +63,7 @@ // Enumerate objects CComPtr<IEnumIDList> pEndl; LPITEMIDLIST pidl; - STRRET stret; - ULONG count = 0; + STRRET stret; hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pEndl); if (FAILED_UNEXPECTEDLY(hr)) { @@ -71,7 +71,7 @@ return hr; } - for (int i=0; pEndl->Next(1, &pidl, NULL) != S_FALSE; i++, count++) + for (int i=0; pEndl->Next(1, &pidl, NULL) != S_FALSE; i++) { WCHAR sz[MAX_PATH]; int index = SHMapPIDLToSystemImageListIndex(m_pISF, pidl, NULL); @@ -84,8 +84,7 @@ StrRetToBuf(&stret, pidl, sz, _countof(sz)); TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)pidl, (INT_PTR)sz }; - SendMessage(m_hWnd, TB_INSERTBUTTONW, i, (LPARAM)&tb); - //CoTaskMemFree(pidl); + SendMessage(m_hWnd, TB_INSERTBUTTONW, i, (LPARAM)&tb); } // Resize the toolbar, and then show it. @@ -169,6 +168,18 @@ if (m_hWnd) { ShowWindow(SW_HIDE); + + CComPtr<IEnumIDList> pEndl; + LPITEMIDLIST pidl; + HRESULT hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pEndl); + if (FAILED_UNEXPECTEDLY(hr)) + { + DestroyWindow(); + return hr; + } + while (pEndl->Next(1, &pidl, NULL) != S_FALSE) + CoTaskMemFree(pidl); + DestroyWindow(); m_hWnd = NULL; return S_OK; @@ -287,14 +298,7 @@ } /*****************************************************************************/ -// *** IWinEventHandler *** - STDMETHODIMP CISFBand::ProcessMessage(IN HWND hWnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam, OUT LRESULT *plrResult) - { - TRACE("CISFBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); - - return E_NOTIMPL; - } - +// *** IWinEventHandler *** STDMETHODIMP CISFBand::ContainsWindow(IN HWND hWnd) { if (hWnd == m_hWnd || IsChild(hWnd)) @@ -351,7 +355,7 @@ { CMINVOKECOMMANDINFOEX info = { 0 }; info.cbSize = sizeof(info); - info.fMask = CMIC_MASK_UNICODE | CMIC_MASK_PTINVOKE; + info.fMask = CMIC_MASK_PTINVOKE; if (GetKeyState(VK_CONTROL) < 0) { info.fMask |= CMIC_MASK_CONTROL_DOWN; @@ -361,8 +365,7 @@ info.fMask |= CMIC_MASK_SHIFT_DOWN; } info.hwnd = m_hWnd; - info.lpVerb = MAKEINTRESOURCEA(id - 1); - info.lpVerbW = MAKEINTRESOURCEW(id - 0x7FFF); + info.lpVerb = MAKEINTRESOURCEA(id - 1); info.nShow = SW_SHOWNORMAL; info.ptInvoke = pt; picm->InvokeCommand((LPCMINVOKECOMMANDINFO)&info); @@ -536,25 +539,25 @@ STDMETHODIMP CISFBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - HMENU qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_POPUPMENU)); + HMENU qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_POPUPMENU)); + if(m_textFlag) + CheckMenuItem(qMenu, IDM_SHOW_TEXT, MF_CHECKED); + else + CheckMenuItem(qMenu, IDM_SHOW_TEXT, MF_UNCHECKED); + + if (m_iconFlag) + { + CheckMenuItem(qMenu, IDM_SMALL_ICONS, MF_CHECKED); + CheckMenuItem(qMenu, IDM_LARGE_ICONS, MF_UNCHECKED); + } + else + { + CheckMenuItem(qMenu, IDM_LARGE_ICONS, MF_CHECKED); + CheckMenuItem(qMenu, IDM_SMALL_ICONS, MF_UNCHECKED); + } + UINT idMax = Shell_MergeMenus(hmenu, GetSubMenu(qMenu, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); - - if(m_textFlag) - CheckMenuItem(hmenu, IDM_SHOW_TEXT, MF_CHECKED); - else - CheckMenuItem(hmenu, IDM_SHOW_TEXT, MF_UNCHECKED); - - if (m_iconFlag) - { - CheckMenuItem(hmenu, IDM_SMALL_ICONS, MF_CHECKED); - CheckMenuItem(hmenu, IDM_LARGE_ICONS, MF_UNCHECKED); - } - else - { - CheckMenuItem(hmenu, IDM_LARGE_ICONS, MF_CHECKED); - CheckMenuItem(hmenu, IDM_SMALL_ICONS, MF_UNCHECKED); - } - + DestroyMenu(qMenu); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(idMax - idCmdFirst +1)); } Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Fri Jul 7 16:13:47 2017 @@ -102,15 +102,7 @@ IN BOOL fClearDirty ); -// IWinEventHandler - - virtual STDMETHODIMP ProcessMessage( - IN HWND hWnd, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam, - OUT LRESULT *plrResult - ); +// IWinEventHandler virtual STDMETHODIMP ContainsWindow( IN HWND hWnd Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Fri Jul 7 16:13:47 2017 @@ -253,13 +253,6 @@ /*****************************************************************************/ // IWinEventHandler - STDMETHODIMP CQuickLaunchBand::ProcessMessage(IN HWND hWnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam, OUT LRESULT *plrResult) - { - TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); - - return E_NOTIMPL; - } - STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) { return E_NOTIMPL; Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Fri Jul 7 16:13:47 2017 @@ -98,15 +98,7 @@ IN BOOL fClearDirty ); -// IWinEventHandler - - virtual STDMETHODIMP ProcessMessage( - IN HWND hWnd, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam, - OUT LRESULT *plrResult - ); +// IWinEventHandler virtual STDMETHODIMP ContainsWindow( IN HWND hWnd Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] Fri Jul 7 16:13:47 2017 @@ -37,8 +37,5 @@ #include <wine/unicode.h> #include "resource.h" - -#undef DbgPrint - #include "CQuickLaunchBand.h" #include "CISFBand.h" Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h [iso-8859-1] Fri Jul 7 16:13:47 2017 @@ -3,9 +3,9 @@ #define IDR_QCKLNCH 1001 #define IDM_POPUPMENU 2001 -#define IDM_LARGE_ICONS 101 -#define IDM_SMALL_ICONS 102 -#define IDM_SHOW_TEXT 103 -#define IDM_VIEW_MENU 104 +#define IDM_LARGE_ICONS 1 +#define IDM_SMALL_ICONS 2 +#define IDM_SHOW_TEXT 3 +#define IDM_VIEW_MENU 4 -#define IDS_BROWSEINFO_TITLE 201 +#define IDS_BROWSEINFO_TITLE 101

7 years, 5 months

[ssawant] 75297: [QCKLNCH] -Removed CWindowImpl -Added CWindow -Used OnWinEvent() instead of subclassing -Handled WM_COMMAND and WM_NOTIFY as needed -Now along with buttons chevron menu is also wor...

by ssawant＠svn.reactos.org

Author: ssawant Date: Fri Jul 7 14:53:11 2017 New Revision: 75297 URL: http://svn.reactos.org/svn/reactos?rev=75297&view=rev Log: [QCKLNCH] -Removed CWindowImpl -Added CWindow -Used OnWinEvent() instead of subclassing -Handled WM_COMMAND and WM_NOTIFY as needed -Now along with buttons chevron menu is also working CR-122 (https://code.reactos.org/cru/CR-122#details) PS: Thank you everyone for spending your time and giving a thorough review. :) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Fri Jul 7 14:53:11 2017 @@ -7,7 +7,6 @@ */ #include "precomp.h" -#include <mshtmcid.h> #include <commoncontrols.h> #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) @@ -26,7 +25,7 @@ // *** CISFBand *** CISFBand::CISFBand() : - m_BandID(0), + m_BandID(0), m_pidl(NULL), m_textFlag(true), m_iconFlag(true) @@ -34,84 +33,10 @@ } CISFBand::~CISFBand() -{ +{ } -// *** CWindowImpl *** -// Subclassing - -LRESULT CISFBand::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - TBBUTTON tb; - POINT pt; - DWORD pos = GetMessagePos(); - pt.x = GET_X_LPARAM(pos); - pt.y = GET_Y_LPARAM(pos); - ScreenToClient(&pt); - - int index = SendMessage(m_hWnd, TB_HITTEST, 0, (LPARAM)&pt); - bool chk = SendMessage(m_hWnd, TB_GETBUTTON, abs(index), (LPARAM)&tb); - if(chk) - SHInvokeDefaultCommand(m_hWnd, m_pISF, (LPITEMIDLIST)tb.dwData); - - return 0; -} - -LRESULT CISFBand::OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - HRESULT hr; - CComPtr<IContextMenu> picm; - HMENU fmenu = CreatePopupMenu(); - TBBUTTON tb; - POINT pt; - DWORD pos = GetMessagePos(); - pt.x = GET_X_LPARAM(pos); - pt.y = GET_Y_LPARAM(pos); - ScreenToClient(&pt); - - int index = SendMessage(m_hWnd, TB_HITTEST, 0, (LPARAM)&pt); - bool chk = SendMessage(m_hWnd, TB_GETBUTTON, abs(index), (LPARAM)&tb); - LPITEMIDLIST pidl = (LPITEMIDLIST)tb.dwData; - - if (chk) - { - ClientToScreen(&pt); - hr = m_pISF->GetUIObjectOf(m_hWnd, 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &picm)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = picm->QueryContextMenu(fmenu, 0, 1, 0x7FFF, CMF_DEFAULTONLY); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - int id = TrackPopupMenuEx(fmenu, TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RETURNCMD, pt.x, pt.y, m_hWnd, 0); - if (id > 0) - { - CMINVOKECOMMANDINFOEX info = { 0 }; - info.cbSize = sizeof(info); - info.fMask = CMIC_MASK_UNICODE | CMIC_MASK_PTINVOKE; - if (GetKeyState(VK_CONTROL) < 0) - { - info.fMask |= CMIC_MASK_CONTROL_DOWN; - } - if (GetKeyState(VK_SHIFT) < 0) - { - info.fMask |= CMIC_MASK_SHIFT_DOWN; - } - info.hwnd = m_hWnd; - info.lpVerb = MAKEINTRESOURCEA(id - 1); - info.lpVerbW = MAKEINTRESOURCEW(id - 0x7FFF); - info.nShow = SW_SHOWNORMAL; - info.ptInvoke = pt; - picm->InvokeCommand((LPCMINVOKECOMMANDINFO)&info); - } - } - - DestroyMenu(fmenu); - return 0; -} - -// ToolbarTest +// Toolbar HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) { // Declare and initialize local constants. @@ -159,9 +84,9 @@ StrRetToBuf(&stret, pidl, sz, _countof(sz)); TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)pidl, (INT_PTR)sz }; - SendMessage(m_hWnd, TB_INSERTBUTTONW, 0, (LPARAM)&tb); - //CoTaskMemFree(pidl); - } + SendMessage(m_hWnd, TB_INSERTBUTTONW, i, (LPARAM)&tb); + //CoTaskMemFree(pidl); + } // Resize the toolbar, and then show it. SendMessage(m_hWnd, TB_AUTOSIZE, 0, 0); @@ -189,11 +114,7 @@ hr = CreateSimpleToolbar(hwndParent); if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = SubclassWindow(m_hWnd); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + return hr; return S_OK; } @@ -386,20 +307,83 @@ } STDMETHODIMP CISFBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) - { - /* switch (uMsg) + { + switch (uMsg) { case WM_COMMAND: { - MessageBox(L"Button Clicked", L"Test", MB_OKCANCEL | MB_ICONINFORMATION); - + TBBUTTON tb; + bool chk = SendMessage(m_hWnd, TB_GETBUTTON, LOWORD(wParam), (LPARAM)&tb); + if (chk) + SHInvokeDefaultCommand(m_hWnd, m_pISF, (LPITEMIDLIST)tb.dwData); + + *theResult = TRUE; break; - } - } - return DefSubclassProc(hWnd, uMsg, wParam, lParam);*/ - - UNIMPLEMENTED; - return E_NOTIMPL; + } + case WM_NOTIFY: + { + switch (((LPNMHDR)lParam)->code) + { + case NM_RCLICK: + { + HRESULT hr; + POINT pt = ((LPNMMOUSE)lParam)->pt; + CComPtr<IContextMenu> picm; + HMENU fmenu = CreatePopupMenu(); + TBBUTTON tb; + + bool chk = SendMessage(m_hWnd, TB_GETBUTTON, ((LPNMMOUSE)lParam)->dwItemSpec, (LPARAM)&tb); + LPITEMIDLIST pidl = (LPITEMIDLIST)tb.dwData; + + if (chk) + { + ClientToScreen(&pt); + hr = m_pISF->GetUIObjectOf(m_hWnd, 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &picm)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = picm->QueryContextMenu(fmenu, 0, 1, 0x7FFF, CMF_DEFAULTONLY); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + int id = TrackPopupMenuEx(fmenu, TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RETURNCMD, pt.x, pt.y, m_hWnd, 0); + if (id > 0) + { + CMINVOKECOMMANDINFOEX info = { 0 }; + info.cbSize = sizeof(info); + info.fMask = CMIC_MASK_UNICODE | CMIC_MASK_PTINVOKE; + if (GetKeyState(VK_CONTROL) < 0) + { + info.fMask |= CMIC_MASK_CONTROL_DOWN; + } + if (GetKeyState(VK_SHIFT) < 0) + { + info.fMask |= CMIC_MASK_SHIFT_DOWN; + } + info.hwnd = m_hWnd; + info.lpVerb = MAKEINTRESOURCEA(id - 1); + info.lpVerbW = MAKEINTRESOURCEW(id - 0x7FFF); + info.nShow = SW_SHOWNORMAL; + info.ptInvoke = pt; + picm->InvokeCommand((LPCMINVOKECOMMANDINFO)&info); + } + } + DestroyMenu(fmenu); + + *theResult = TRUE; + break; + } + default: + *theResult = FALSE; + } + + break; + } + default: + *theResult = FALSE; + } + + return S_OK; } STDMETHODIMP CISFBand::IsWindowOwner(HWND hWnd) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Fri Jul 7 14:53:11 2017 @@ -9,7 +9,7 @@ // COM class for cisfband class CISFBand : - public CWindowImpl<CISFBand>, + public CWindow, public CComCoClass<CISFBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, @@ -24,9 +24,9 @@ DWORD m_BandID; CComPtr<IUnknown> m_Site; - // Toolbar + // Toolbar CComPtr<IShellFolder> m_pISF; - PCIDLIST_ABSOLUTE m_pidl; + PCIDLIST_ABSOLUTE m_pidl; // Menu BOOL m_textFlag; @@ -39,8 +39,6 @@ // Personal Methods HRESULT CreateSimpleToolbar(HWND hWndParent); - LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); // IObjectWithSite @@ -182,11 +180,7 @@ UINT uFlags ); -//***************************************************************************************************** - BEGIN_MSG_MAP(CISFBand) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) - END_MSG_MAP() +//***************************************************************************************************** DECLARE_NOT_AGGREGATABLE(CISFBand) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h [iso-8859-1] Fri Jul 7 14:53:11 2017 @@ -2,10 +2,10 @@ #define IDR_QCKLNCH 1001 -#define IDM_POPUPMENU 2000 -#define IDM_LARGE_ICONS 1 -#define IDM_SMALL_ICONS 2 -#define IDM_SHOW_TEXT 3 -#define IDM_VIEW_MENU 4 +#define IDM_POPUPMENU 2001 +#define IDM_LARGE_ICONS 101 +#define IDM_SMALL_ICONS 102 +#define IDM_SHOW_TEXT 103 +#define IDM_VIEW_MENU 104 -#define IDS_BROWSEINFO_TITLE 100 +#define IDS_BROWSEINFO_TITLE 201

7 years, 5 months

[rgampa] 75296: [USBXHCI] - few changes to stably load the driver onto windows 2003 server edition. CORE-13344

by rgampa＠svn.reactos.org

Author: rgampa Date: Fri Jul 7 09:06:09 2017 New Revision: 75296 URL: http://svn.reactos.org/svn/reactos?rev=75296&view=rev Log: [USBXHCI] - few changes to stably load the driver onto windows 2003 server edition. CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Fri Jul 7 09:06:09 2017 @@ -42,6 +42,7 @@ IN PUSHORT Status) { DPRINT1("XHCI_RH_GetStatus: function initiated\n"); + *Status = 1; return 0; } @@ -61,7 +62,7 @@ XhciExtension = (PXHCI_EXTENSION)xhciExtension; PortStatusReg = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusReg) ; - + PortStatusRegister.AsULONG = 0; *PortStatus = PortStatusRegister.AsULONG; return MP_STATUS_SUCCESS; @@ -73,6 +74,7 @@ IN PULONG HubStatus) { DPRINT1("XHCI_RH_GetHubStatus: function initiated\n"); + *HubStatus = 0; return 0; } @@ -214,7 +216,7 @@ XHCI_RH_DisableIrq(IN PVOID xhciExtension) { DPRINT1("XHCI_RH_DisableIrq: function initiated\n"); - PXHCI_EXTENSION XhciExtension; + /*PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; XHCI_USB_COMMAND usbCommand; @@ -225,7 +227,7 @@ usbCommand.InterrupterEnable = 0; WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD,usbCommand.AsULONG ); - DPRINT1("XHCI_RH_DisableIrq: Disable Interupts succesfull\n"); + DPRINT1("XHCI_RH_DisableIrq: Disable Interupts succesfull\n");*/ } VOID Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Fri Jul 7 09:06:09 2017 @@ -205,10 +205,7 @@ ASSERT(Command.RunStop==0); //required before setting max device slots enabled. Config.MaxDeviceSlotsEnabled = 1; // max possible value is number of slots HCSPARAMS1 WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CONFIG, Config.AsULONG); - // Device Context base aaddress array to be defined - // Commnad ring deque pointer to be defined in CRCR - - //DbgBreakPoint(); + return MP_STATUS_SUCCESS; } @@ -282,8 +279,8 @@ return MPStatus; } - //Command.RunStop =1; - //WRITE_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD, Command.AsULONG ); + Command.RunStop =1; + WRITE_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD, Command.AsULONG ); //DPRINT1("XHCI_StartController: UNIMPLEMENTED. FIXME\n"); return MP_STATUS_SUCCESS; } @@ -300,6 +297,10 @@ NTAPI XHCI_SuspendController(IN PVOID xhciExtension) { + PXHCI_EXTENSION XhciExtension; + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + + XhciExtension->Flags |= XHCI_FLAGS_CONTROLLER_SUSPEND; DPRINT1("XHCI_SuspendController: function initiated\n"); } @@ -308,6 +309,10 @@ XHCI_ResumeController(IN PVOID xhciExtension) { DPRINT1("XHCI_ResumeController: function initiated\n"); + PXHCI_EXTENSION XhciExtension; + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + + XhciExtension->Flags &= ~XHCI_FLAGS_CONTROLLER_SUSPEND; return MP_STATUS_SUCCESS; } @@ -335,13 +340,16 @@ RunTimeRegisterBase = XhciExtension-> RunTimeRegisterBase; Iman.AsULONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_IMAN); - - Iman.InterruptPending =0; + if (Iman.InterruptPending == 0) + { + return FALSE; + } + Iman.InterruptPending =1; WRITE_REGISTER_ULONG(RunTimeRegisterBase + XHCI_IMAN, Iman.AsULONG); DPRINT1("XHCI_InterruptService: Succesful Interupt\n"); // changing the enque pointer - erstdp.AsULONGLONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_ERSTDP + 1)||READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_ERSTDP); + erstdp.AsULONGLONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_ERSTDP + 1)|READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_ERSTDP); erstdp.AsULONGLONG = erstdp.AsULONGLONG +2; erstdp.DequeueERSTIndex =0; WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); @@ -440,6 +448,7 @@ NTAPI XHCI_CheckController(IN PVOID xhciExtension) { + //RegPacket.UsbPortInvalidateController(xhciExtension, 2); DPRINT1("XHCI_CheckController: function initiated\n"); } @@ -489,6 +498,22 @@ XHCI_PollController(IN PVOID xhciExtension) { DPRINT1("XHCI_PollController: function initiated\n"); + PXHCI_EXTENSION XhciExtension; + PULONG OperationalRegs; + //ULONG Port; + //XHCI_PORT_STATUS_CONTROL PortSC; + + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + OperationalRegs = XhciExtension->OperationalRegs; + + if (!(XhciExtension->Flags & XHCI_FLAGS_CONTROLLER_SUSPEND)) + { + RegPacket.UsbPortInvalidateRootHub(XhciExtension); + return; + } + //RegPacket.UsbPortInvalidateRootHub(xhciExtension); + } VOID Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] Fri Jul 7 09:06:09 2017 @@ -12,7 +12,7 @@ extern USBPORT_REGISTRATION_PACKET RegPacket; - +#define XHCI_FLAGS_CONTROLLER_SUSPEND 0x01 //Data structures typedef struct _XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY { PHYSICAL_ADDRESS ContextBaseAddr [256]; @@ -222,109 +222,109 @@ VOID NTAPI XHCI_RH_GetRootHubData( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN PVOID rootHubData); MPSTATUS NTAPI XHCI_RH_GetStatus( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN PUSHORT Status); MPSTATUS NTAPI XHCI_RH_GetPortStatus( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port, IN PULONG PortStatus); MPSTATUS NTAPI XHCI_RH_GetHubStatus( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN PULONG HubStatus); MPSTATUS NTAPI XHCI_RH_SetFeaturePortReset( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_SetFeaturePortPower( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_SetFeaturePortEnable( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_SetFeaturePortSuspend( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortEnable( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortPower( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortSuspend( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortEnableChange( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortConnectChange( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortResetChange( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortSuspendChange( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); MPSTATUS NTAPI XHCI_RH_ClearFeaturePortOvercurrentChange( - IN PVOID ohciExtension, + IN PVOID xhciExtension, IN USHORT Port); VOID NTAPI XHCI_RH_DisableIrq( - IN PVOID ohciExtension); + IN PVOID xhciExtension); VOID NTAPI XHCI_RH_EnableIrq( - IN PVOID ohciExtension); + IN PVOID xhciExtension); #endif /* USBXHCI_H__ */

7 years, 5 months

[hbelusca] 75295: [USERINIT]: Use a real horizontal line for the separator line in the userinit livecd pages. CORE-13528 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 6 22:48:01 2017 New Revision: 75295 URL: http://svn.reactos.org/svn/reactos?rev=75295&view=rev Log: [USERINIT]: Use a real horizontal line for the separator line in the userinit livecd pages. CORE-13528 #resolve Modified: branches/setup_improvements/base/system/userinit/lang/bg-BG.rc branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc branches/setup_improvements/base/system/userinit/lang/de-DE.rc branches/setup_improvements/base/system/userinit/lang/el-GR.rc branches/setup_improvements/base/system/userinit/lang/en-US.rc branches/setup_improvements/base/system/userinit/lang/es-ES.rc branches/setup_improvements/base/system/userinit/lang/fr-FR.rc branches/setup_improvements/base/system/userinit/lang/he-IL.rc branches/setup_improvements/base/system/userinit/lang/hu-HU.rc branches/setup_improvements/base/system/userinit/lang/id-ID.rc branches/setup_improvements/base/system/userinit/lang/it-IT.rc branches/setup_improvements/base/system/userinit/lang/ja-JP.rc branches/setup_improvements/base/system/userinit/lang/lt-LT.rc branches/setup_improvements/base/system/userinit/lang/nl-NL.rc branches/setup_improvements/base/system/userinit/lang/no-NO.rc branches/setup_improvements/base/system/userinit/lang/pl-PL.rc branches/setup_improvements/base/system/userinit/lang/pt-BR.rc branches/setup_improvements/base/system/userinit/lang/ro-RO.rc branches/setup_improvements/base/system/userinit/lang/ru-RU.rc branches/setup_improvements/base/system/userinit/lang/sk-SK.rc branches/setup_improvements/base/system/userinit/lang/sq-AL.rc branches/setup_improvements/base/system/userinit/lang/sv-SE.rc branches/setup_improvements/base/system/userinit/lang/th-TH.rc branches/setup_improvements/base/system/userinit/lang/tr-TR.rc branches/setup_improvements/base/system/userinit/lang/uk-UA.rc branches/setup_improvements/base/system/userinit/lang/zh-CN.rc branches/setup_improvements/base/system/userinit/lang/zh-TW.rc Modified: branches/setup_improvements/base/system/userinit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/bg-BG.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -17,7 +17,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Vyberte si svÅ¯j jazyk a rozloÅ¾enÃ klÃ¡vesnice a kliknÄtÄ na DalÅ¡Ã.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&DalÅ¡Ã", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Storno", IDCANCEL, 260, 172, 50, 14 END @@ -31,9 +31,9 @@ DEFPUSHBUTTON "Spustit &Live CD ReactOS", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Instalovat ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&PÅedchozÃ", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Storno", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/de-DE.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/de-DE.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/el-GR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/el-GR.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/en-US.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/en-US.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/es-ES.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/es-ES.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/fr-FR.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/he-IL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/he-IL.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/hu-HU.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/id-ID.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/id-ID.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/it-IT.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/it-IT.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Selezionare la lingua e il layout di tastiera e premere su Avanti per continuare.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Avanti", IDOK, 205, 172, 50, 14 PUSHBUTTON "A&nnulla", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Avvia ReactOS con &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Installa ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Precedente", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Annulla", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/ja-JP.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/lt-LT.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/lt-LT.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/nl-NL.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/no-NO.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/no-NO.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/pl-PL.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -19,7 +19,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -33,9 +33,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/pt-BR.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/ro-RO.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "SelectaÈi limba Èi aranjamentul de tastaturÄ apoi apÄsaÈi âÃnainteâ pentru a continua.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "Ãn&ainte", IDOK, 205, 172, 50, 14 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "LanseazÄ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&InstaleazÄ ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "Ãn&apoi", IDOK, 205, 172, 50, 14 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/ru-RU.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº Ð¸ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ, Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐÐ°Ð»ÐµÐµ, ÑÑÐ¾Ð±Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&ÐÐ°Ð»ÐµÐµ", IDOK, 205, 172, 50, 14 PUSHBUTTON "&ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&ÐÐ°Ð·Ð°Ð´", IDOK, 205, 172, 50, 14 PUSHBUTTON "&ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/sk-SK.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/sq-AL.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -16,7 +16,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -30,9 +30,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/sv-SE.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/th-TH.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/th-TH.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -12,7 +12,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -26,9 +26,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/tr-TR.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Dilinizi ve dÃ¼Äme takÄ±mÄ± dizininizi seÃ§iniz ve sÃ¼rdÃ¼rmek iÃ§in Ä°leri'ye tÄ±klayÄ±nÄ±z.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "Ä°leri", IDOK, 205, 172, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "&ReactOS ÃalÄ±Åan CD'yi ÃalÄ±ÅtÄ±r", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "R&eactOS'u Kur", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "Geri", IDOK, 205, 172, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/uk-UA.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -20,7 +20,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END @@ -34,9 +34,9 @@ DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/zh-CN.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "éæ©æ¨çè¯è¨åé®çå¸å±ï¼è¯·åå»ä¸ä¸æ¥ç»§ç»ã", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "ä¸ä¸æ¥(&N)", IDOK, 205, 172, 50, 14 PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "è¿è¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "ä¸ä¸é¡µ(&P)", IDOK, 205, 172, 50, 14 PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END Modified: branches/setup_improvements/base/system/userinit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/lang/zh-TW.rc [iso-8859-1] Thu Jul 6 22:48:01 2017 @@ -14,7 +14,7 @@ COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "é¸ææ¨çèªè¨åéµç¤éç½®ï¼è«æä¸ä¸ä¸ä¸æ¥ç¹¼çºã", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 DEFPUSHBUTTON "ä¸ä¸æ¥(&N)", IDOK, 205, 172, 50, 14 PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END @@ -28,9 +28,9 @@ DEFPUSHBUTTON "éè¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21 - LTEXT "", IDC_STATIC, 7, 152, 300, 8 + // LTEXT "", IDC_STATIC, 7, 152, 300, 8 - GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1 PUSHBUTTON "ä¸ä¸é (&P)", IDOK, 205, 172, 50, 14 PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END

7 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2017