Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54530: [NTOSKRNL] - Remove a superfluous user LRU insertion and removal - Add a missing user LRU insertion
by cgutman＠svn.reactos.org 29 Nov '11

29 Nov '11

Author: cgutman Date: Tue Nov 29 03:24:03 2011 New Revision: 54530 URL: http://svn.reactos.org/svn/reactos?rev=54530&view=rev Log: [NTOSKRNL] - Remove a superfluous user LRU insertion and removal - Add a missing user LRU insertion Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Tue Nov 29 03:24:03 2011 @@ -122,7 +122,6 @@ Entry = RemoveHeadList(&AllocationListHead); Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); KeReleaseSpinLock(&AllocationListLock, OldIrql); - if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); MiZeroPhysicalPage(Page); Request->Page = Page; KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); @@ -256,6 +255,7 @@ { KeBugCheck(NO_PAGES_AVAILABLE); } + if (Consumer == MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage = Page; if (MmAvailablePages <= MiMinimumAvailablePages && MiBalancerThreadHandle != NULL) @@ -304,10 +304,10 @@ { KeBugCheck(NO_PAGES_AVAILABLE); } - /* Update the Consumer and make the page active */ - if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); + *AllocatedPage = Page; (void)InterlockedDecrementUL(&MiPagesRequired); + return(STATUS_SUCCESS); }

1 0

[rharabien] 54529: [SHELL32] - Display file size in bytes in file properties dialog - Don't use ULONGLONG if ULONG is enough - Change LARGE_INTEGER to ULARGE_INTEGER where it makes sense - Fix calc...
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 21:54:45 2011 New Revision: 54529 URL: http://svn.reactos.org/svn/reactos?rev=54529&view=rev Log: [SHELL32] - Display file size in bytes in file properties dialog - Don't use ULONGLONG if ULONG is enough - Change LARGE_INTEGER to ULARGE_INTEGER where it makes sense - Fix calculation of file size in CountFolderAndFiles - WM_GETTEXT receives size in bytes (not characters count) - Use Get(Set)DlgItemTextW instead of SendDlgItemMessageW Patch by Carlo Bramix. Improvements by me. See issue #6294 for more details. Modified: trunk/reactos/dll/win32/shell32/dialogs.cpp trunk/reactos/dll/win32/shell32/drive.cpp trunk/reactos/dll/win32/shell32/folder_options.cpp trunk/reactos/dll/win32/shell32/fprop.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/she_ocmenu.cpp trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shelllink.cpp trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.cpp [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -119,9 +119,9 @@ pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) - SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); + SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); else - SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName); + SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); count = SendMessage(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); if (count != LB_ERR) @@ -138,7 +138,7 @@ case IDOK: index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); pIconContext->Index = index; - SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_GETTEXT, MAX_PATH, (LPARAM)pIconContext->szName); + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName, MAX_PATH); DestroyIconList(pIconContext->hDlgCtrl); EndDialog(hwndDlg, 1); break; @@ -179,9 +179,9 @@ wcscpy(pIconContext->szName, szText); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) - SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); + SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); else - SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName); + SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); } Modified: trunk/reactos/dll/win32/shell32/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.cpp [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -276,7 +276,7 @@ static -ULONGLONG +ULONG GetFreeBytesShare(ULONGLONG TotalNumberOfFreeBytes, ULONGLONG TotalNumberOfBytes) { ULONGLONG Temp; @@ -293,7 +293,7 @@ } else { - return TotalNumberOfFreeBytes / Temp; + return (ULONG)(TotalNumberOfFreeBytes / Temp); } } @@ -333,7 +333,7 @@ hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); - SendDlgItemMessageW(hwndDlg, 14006, WM_GETTEXT, 20, (LPARAM)szBuffer); + GetDlgItemTextW(hwndDlg, 14006, szBuffer, 20); Result = _wtoi(szBuffer); CopyRect(&rect, &drawItem->rcItem); @@ -363,17 +363,17 @@ BOOL ret; UINT DriveType; ULARGE_INTEGER FreeBytesAvailable; - LARGE_INTEGER TotalNumberOfFreeBytes; - LARGE_INTEGER TotalNumberOfBytes; + ULARGE_INTEGER TotalNumberOfFreeBytes; + ULARGE_INTEGER TotalNumberOfBytes; ret = GetVolumeInformationW(szDrive, szVolumeName, MAX_PATH+1, NULL, &MaxComponentLength, &FileSystemFlags, FileSystemName, MAX_PATH+1); if (ret) { /* set volume label */ - SendDlgItemMessageW(hwndDlg, 14000, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szVolumeName); + SetDlgItemTextW(hwndDlg, 14000, szVolumeName); /* set filesystem type */ - SendDlgItemMessageW(hwndDlg, 14002, WM_SETTEXT, (WPARAM)NULL, (LPARAM)FileSystemName); + SetDlgItemTextW(hwndDlg, 14002, FileSystemName); } @@ -381,10 +381,10 @@ if (DriveType == DRIVE_FIXED || DriveType == DRIVE_CDROM) { - if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, (PULARGE_INTEGER)&TotalNumberOfBytes, (PULARGE_INTEGER)&TotalNumberOfFreeBytes)) + if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) { WCHAR szResult[128]; - LONGLONG Result; + ULONG Result; HANDLE hVolume; DWORD BytesReturned = 0; @@ -394,7 +394,7 @@ { ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&TotalNumberOfBytes, sizeof(ULARGE_INTEGER), &BytesReturned, NULL); if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + SetDlgItemTextW(hwndDlg, 14007, szResult); CloseHandle(hVolume); } @@ -402,35 +402,35 @@ TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned %d\n", debugstr_w(szResult), hVolume, ret, TotalNumberOfBytes.QuadPart, BytesReturned); if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + SetDlgItemTextW(hwndDlg, 14003, szResult); if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + SetDlgItemTextW(hwndDlg, 14005, szResult); Result = GetFreeBytesShare(TotalNumberOfFreeBytes.QuadPart, TotalNumberOfBytes.QuadPart); /* set free bytes percentage */ - swprintf(szResult, L"%02d%%", Result); - SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + swprintf(szResult, L"%02u%%", Result); + SetDlgItemTextW(hwndDlg, 14006, szResult); /* store used share amount */ Result = 100 - Result; - swprintf(szResult, L"%02d%%", Result); - SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + swprintf(szResult, L"%02u%%", Result); + SetDlgItemTextW(hwndDlg, 14004, szResult); if (DriveType == DRIVE_FIXED) { if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); + SetDlgItemTextW(hwndDlg, 14001, szBuffer); } else /* DriveType == DRIVE_CDROM) */ { if (LoadStringW(shell32_hInstance, IDS_DRIVE_CDROM, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); + SetDlgItemTextW(hwndDlg, 14001, szBuffer); } } } /* set drive description */ - SendDlgItemMessageW(hwndDlg, 14009, WM_GETTEXT, (WPARAM)50, (LPARAM)szFormat); + GetDlgItemTextW(hwndDlg, 14009, szFormat, 50); swprintf(szBuffer, szFormat, szDrive); - SendDlgItemMessageW(hwndDlg, 14009, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szBuffer); + SetDlgItemTextW(hwndDlg, 14009, szBuffer); } @@ -503,7 +503,7 @@ if (lppsn->hdr.code == PSN_APPLY) { lpstr = (LPWSTR)GetWindowLongPtr(hwndDlg, DWLP_USER); - if (lpstr && SendDlgItemMessageW(hwndDlg, 14000, WM_GETTEXT, sizeof(szPath)/sizeof(WCHAR), (LPARAM)szPath)) + if (lpstr && GetDlgItemTextW(hwndDlg, 14000, szPath, sizeof(szPath)/sizeof(WCHAR))) { szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; SetVolumeLabelW(lpstr, szPath); @@ -943,7 +943,7 @@ { /* set volume label */ szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, 28679, WM_SETTEXT, 0, (LPARAM)&szText[Length+1]); + SetDlgItemTextW(hwndDlg, 28679, &szText[Length+1]); } Length += TempLength + 1; } Modified: trunk/reactos/dll/win32/shell32/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.cpp [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -36,7 +36,7 @@ { DWORD cFiles; DWORD cFolder; - LARGE_INTEGER bSize; + ULARGE_INTEGER bSize; HWND hwndDlg; WCHAR szFolderPath[MAX_PATH]; }FOLDER_PROPERTIES_CONTEXT, *PFOLDER_PROPERTIES_CONTEXT; @@ -452,7 +452,7 @@ /* format buffer */ swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1]); /* update dialog */ - SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, 0, (LPARAM)Buffer); + SetDlgItemTextW(hwndDlg, 14003, Buffer); if (!LoadStringW(shell32_hInstance, IDS_FILE_DETAILSADV, FormatBuffer, sizeof(FormatBuffer) / sizeof(WCHAR))) { @@ -462,7 +462,7 @@ /* format buffer */ swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1], &pItem->FileDescription[0], &pItem->FileDescription[0]); /* update dialog */ - SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, 0, (LPARAM)Buffer); + SetDlgItemTextW(hwndDlg, 14007, Buffer); } } break; @@ -559,6 +559,7 @@ LPWSTR pOffset; BOOL ret; PFOLDER_PROPERTIES_CONTEXT pContext = (PFOLDER_PROPERTIES_CONTEXT) lParam; + ULARGE_INTEGER FileSize; pOffset = PathAddBackslashW(pContext->szFolderPath); if (!pOffset) @@ -589,9 +590,11 @@ } else { + FileSize.u.LowPart = FindData.nFileSizeLow; + FileSize.u.HighPart = FindData.nFileSizeHigh; + pContext->cFiles++; - pContext->bSize.u.LowPart += FindData.nFileSizeLow; - pContext->bSize.u.HighPart += FindData.nFileSizeHigh; + pContext->bSize.QuadPart += FileSize.QuadPart; } } else if (GetLastError() == ERROR_NO_MORE_FILES) @@ -622,7 +625,7 @@ return; /* set folder name */ - SendDlgItemMessageW(pContext->hwndDlg, 14001, WM_SETTEXT, 0, (LPARAM) (pFolderName + 1)); + SetDlgItemTextW(pContext->hwndDlg, 14001, pFolderName + 1); /* set folder location */ pFolderName[0] = L'\0'; if (wcslen(pContext->szFolderPath) == 2) @@ -630,11 +633,11 @@ /* folder is located at root */ WCHAR szDrive[4] = {L'C',L':',L'\\',L'\0'}; szDrive[0] = pContext->szFolderPath[0]; - SendDlgItemMessageW(pContext->hwndDlg, 14007, WM_SETTEXT, 0, (LPARAM) szDrive); + SetDlgItemTextW(pContext->hwndDlg, 14007, szDrive); } else { - SendDlgItemMessageW(pContext->hwndDlg, 14007, WM_SETTEXT, 0, (LPARAM) pContext->szFolderPath); + SetDlgItemTextW(pContext->hwndDlg, 14007, pContext->szFolderPath); } pFolderName[0] = L'\\'; /* get folder properties */ @@ -656,7 +659,7 @@ { FileTimeToSystemTime(&ft, &dt); swprintf (szBuffer, wFormat, dt.wDay, dt.wMonth, dt.wYear, dt.wHour, dt.wMinute); - SendDlgItemMessageW(pContext->hwndDlg, 14015, WM_SETTEXT, 0, (LPARAM) szBuffer); + SetDlgItemTextW(pContext->hwndDlg, 14015, szBuffer); } } /* now enumerate enumerate contents */ @@ -667,12 +670,12 @@ LoadStringW(shell32_hInstance, IDS_FILE_FOLDER, szFormat, sizeof(szFormat)/sizeof(WCHAR)); szFormat[(sizeof(szFormat)/sizeof(WCHAR))-1] = L'\0'; swprintf(szBuffer, szFormat, pContext->cFiles, pContext->cFolder); - SendDlgItemMessageW(pContext->hwndDlg, 14011, WM_SETTEXT, 0, (LPARAM) szBuffer); - - if (StrFormatByteSizeW(pContext->bSize.QuadPart, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + SetDlgItemTextW(pContext->hwndDlg, 14011, szBuffer); + + if (SH_FormatFileSizeWithBytes(&pContext->bSize, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { /* store folder size */ - SendDlgItemMessageW(pContext->hwndDlg, 14009, WM_SETTEXT, 0, (LPARAM) szBuffer); + SetDlgItemTextW(pContext->hwndDlg, 14009, szBuffer); } } Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -70,22 +70,123 @@ static LONG SH_FileGeneralOpensWith(HWND hwndDlg, WCHAR *fileext) { - HWND hDlgCtrl; LONG result; WCHAR wAppName[MAX_PATH] = {0}; WCHAR wAssocApp[MAX_PATH] = {0}; - hDlgCtrl = GetDlgItem(hwndDlg, 14007); result = SH_GetAssociatedApplication(fileext, wAssocApp); if (result == ERROR_SUCCESS) { _wsplitpath(wAssocApp, NULL, NULL, wAppName, NULL); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)wAppName); + SetDlgItemTextW(hwndDlg, 14007, wAppName); } return result; +} + +/************************************************************************* + * + * SH_FormatFileSizeWithBytes + * + * Format a size in bytes to string. + * + * lpQwSize = Pointer to 64bit large integer to format + * pszBuf = Buffer to fill with output string + * cchBuf = size of pszBuf in characters + * + */ + +LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf) +{ + NUMBERFMTW nf; + WCHAR szNumber[24]; + WCHAR szDecimalSep[8]; + WCHAR szThousandSep[8]; + WCHAR szGrouping[12]; + int Len, cchFormatted, i; + size_t cchRemaining; + LPWSTR Ptr; + + // Try to build first Format byte string + if (StrFormatByteSizeW(lpQwSize->QuadPart, pszBuf, cchBuf) == NULL) + return NULL; + + // If there is less bytes than 1KB, we have nothing to do + if (lpQwSize->QuadPart < 1024) + return pszBuf; + + // Print the number in uniform mode + swprintf(szNumber, L"%I64u", lpQwSize->QuadPart); + + // Get system strings for decimal and thousand separators. + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSep, sizeof(szDecimalSep)/sizeof(*szDecimalSep)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szThousandSep, sizeof(szThousandSep)/sizeof(*szThousandSep)); + + // Initialize format for printing the number in bytes + ZeroMemory(&nf, sizeof(nf)); + nf.NumDigits = 0; + nf.LeadingZero = 0; + nf.Grouping = 0; + nf.lpDecimalSep = szDecimalSep; + nf.lpThousandSep = szThousandSep; + nf.NegativeOrder = 0; + + // Get system string for groups separator + Len = GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_SGROUPING, + szGrouping, + sizeof(szGrouping)/sizeof(*szGrouping)); + + // Convert grouping specs from string to integer + for (i = 0; i < Len; i++) + { + WCHAR wch = szGrouping[i]; + + if (wch >= L'0' && wch <= L'9') + nf.Grouping = nf.Grouping * 10 + (wch - L'0'); + else if (wch != L';') + break; + } + + if ((nf.Grouping % 10) == 0) + nf.Grouping /= 10; + else + nf.Grouping *= 10; + + // Concate " (" at the end of buffer + Len = wcslen(pszBuf); + Ptr = pszBuf + Len; + cchRemaining = cchBuf - Len; + StringCchCopyExW(Ptr, cchRemaining, L" (", &Ptr, &cchRemaining, 0); + + // Save formatted number of bytes in buffer + cchFormatted = GetNumberFormatW(LOCALE_USER_DEFAULT, + 0, + szNumber, + &nf, + Ptr, + cchRemaining); + + if (cchFormatted == 0) + return NULL; + + // cchFormatted is number of characters including NULL - make it a real length + --cchFormatted; + + // Copy ' ' to buffer + Ptr += cchFormatted; + cchRemaining -= cchFormatted; + StringCchCopyExW(Ptr, cchRemaining, L" ", &Ptr, &cchRemaining, 0); + + // Copy 'bytes' string and remaining ')' + Len = LoadStringW(shell32_hInstance, IDS_BYTES_FORMAT, Ptr, cchRemaining); + Ptr += Len; + cchRemaining -= Len; + StringCchCopy(Ptr, cchRemaining, L")"); + + return pszBuf; } /************************************************************************* @@ -309,7 +410,6 @@ int plength; WCHAR *lpdir; WCHAR buff[MAX_PATH]; - HWND hDlgCtrl; if (lpstr == NULL) return FALSE; @@ -330,16 +430,14 @@ wcscat(buff, L"\\"); } - hDlgCtrl = GetDlgItem(hwndDlg, 14009); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); + SetDlgItemTextW(hwndDlg, 14009, buff); } if (flength > 1) { /* text filename field */ wcsncpy(buff, &lpdir[1], flength); - hDlgCtrl = GetDlgItem(hwndDlg, 14001); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); + SetDlgItemTextW(hwndDlg, 14001, buff); } return TRUE; @@ -362,7 +460,6 @@ FILETIME accessed_time; FILETIME write_time; WCHAR resultstr[MAX_PATH]; - HWND hDlgCtrl; LARGE_INTEGER file_size; if (lpfilename == NULL) @@ -392,20 +489,17 @@ if (SHFileGeneralGetFileTimeString(&create_time, resultstr)) { - hDlgCtrl = GetDlgItem(hwndDlg, 14015); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); + SetDlgItemTextW(hwndDlg, 14015, resultstr); } if (SHFileGeneralGetFileTimeString(&accessed_time, resultstr)) { - hDlgCtrl = GetDlgItem(hwndDlg, 14019); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); + SetDlgItemTextW(hwndDlg, 14019, resultstr); } if (SHFileGeneralGetFileTimeString(&write_time, resultstr)) { - hDlgCtrl = GetDlgItem(hwndDlg, 14017); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); + SetDlgItemTextW(hwndDlg, 14017, resultstr); } if (!GetFileSizeEx(hFile, &file_size)) @@ -417,15 +511,13 @@ CloseHandle(hFile); - if (!StrFormatByteSizeW(file_size.QuadPart, - resultstr, - sizeof(resultstr) / sizeof(WCHAR))) - return FALSE; - - hDlgCtrl = GetDlgItem(hwndDlg, 14011); + if (!SH_FormatFileSizeWithBytes((PULARGE_INTEGER)&file_size, + resultstr, + sizeof(resultstr) / sizeof(WCHAR))) + return FALSE; TRACE("result size %u resultstr %s\n", file_size.QuadPart, debugstr_w(resultstr)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); + SetDlgItemTextW(hwndDlg, 14011, resultstr); if (lpfilesize) lpfilesize->QuadPart = (ULONGLONG)file_size.QuadPart; @@ -444,7 +536,6 @@ SH_FileVersionQuerySetText(HWND hwndDlg, DWORD dlgId, LPVOID pInfo, WCHAR *text, WCHAR **resptr) { UINT reslen; - HWND hDlgCtrl; if (hwndDlg == NULL || resptr == NULL || text == NULL) return FALSE; @@ -452,9 +543,8 @@ if (VerQueryValueW(pInfo, text, (LPVOID *)resptr, &reslen)) { /* file description property */ - hDlgCtrl = GetDlgItem(hwndDlg, dlgId); TRACE("%s :: %s\n", debugstr_w(text), debugstr_w(*resptr)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)0, (LPARAM)*resptr); + SetDlgItemTextW(hwndDlg, dlgId, *resptr); return TRUE; } @@ -576,9 +666,8 @@ LOWORD(inf->dwFileVersionMS), HIWORD(inf->dwFileVersionLS), LOWORD(inf->dwFileVersionLS)); - hDlgCtrl = GetDlgItem(hwndDlg, 14001); TRACE("MS %x LS %x res %s \n", inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); + SetDlgItemTextW(hwndDlg, 14001, buff); } if (VerQueryValueW(pBuf, const_cast<LPWSTR>(wTranslation), (LPVOID *)&lplangcode, &infolen)) @@ -613,8 +702,7 @@ hDlgCtrl = GetDlgItem(hwndDlg, 14009); SendMessageW(hDlgCtrl, LB_SETCURSEL, 0, 0); str = (WCHAR *) SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)0, (LPARAM)NULL); - hDlgCtrl = GetDlgItem(hwndDlg, 14010); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); + SetDlgItemTextW(hwndDlg, 14010, str); return TRUE; } @@ -672,9 +760,8 @@ if (str == NULL) break; - hDlgCtrl = GetDlgItem(hwndDlg, 14010); TRACE("hDlgCtrl %x string %s \n", hDlgCtrl, debugstr_w(str)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); + SetDlgItemTextW(hwndDlg, 14010, str); return TRUE; } Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -767,8 +767,9 @@ IDS_FILE_DETAILSADV "Ð¤Ð°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ñ ÑÐ°Ð·ÑÐ¸ÑÐµÐ½Ð¸Ðµ '%s' ÑÐ° Ð¾Ñ Ð²Ð¸Ð´Ð° '%s'. ÐÐ° Ð´Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ, Ð·Ð° Ð²ÑÐ¸ÑÐºÐ¸ '%s' ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ, Ð½Ð°ÑÐ¸ÑÐ½ÐµÑÐµ âÐ Ð°Ð·ÑÐ¸ÑÐµÐ½Ð¸â." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END - - - - + IDS_BYTES_FORMAT "bytes" +END + + + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -754,4 +754,5 @@ IDS_FILE_DETAILSADV "Soubory s pÅÃponou '%s' jsou typu '%s'. KliknutÃm na tlaÄÃtko PokroÄilÃ© lze zmÄnit nastavenÃ pro vÅ¡echny soubory '%s'." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -755,4 +755,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -771,4 +771,5 @@ IDS_FILE_DETAILSADV "Um die Einstellungen, die alle Dateien des Typs '%s' betreffen zu Ã¤ndern, klicken Sie auf Erweitert." IDS_FILE_TYPES "Dateitypen" IDS_COLUMN_EXTENSION "Erweiterungen" -END + IDS_BYTES_FORMAT "Bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -767,4 +767,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -777,4 +777,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -779,4 +779,5 @@ IDS_FILE_DETAILSADV "Los archivos con extensiÃ³n '%s' son del tipo '%s'. Para cambiar la configuraciÃ³n de los archivos '%s', haga clic en Opciones avanzadas." IDS_FILE_TYPES "Tipos de archivos" IDS_COLUMN_EXTENSION "Extensiones" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -770,4 +770,5 @@ IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramÃ¨tres qui concernent tous les fichiers '%s', cliquez sur AvancÃ©." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -769,4 +769,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -234,9 +234,9 @@ BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Tipo del file:", 14004, 8, 35, 50, 10 + LTEXT "Tipo di file:", 14004, 8, 35, 50, 10 LTEXT "File", 14005, 68, 35, 160, 10 - LTEXT "Si apre con:", 14006, 8, 53, 50, 10 + LTEXT "Apri con:", 14006, 8, 53, 50, 10 EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER LTEXT "Posizione:", 14008, 8, 72, 45, 10 EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -437,7 +437,7 @@ PUSHBUTTON "&Nuovo", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Cancella", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Dettagli per l'estensione '%s'", 14003, 7, 130, 249, 70 -LTEXT "Si apre con:", -1, 12, 140, 40, 10 +LTEXT "Apri con:", -1, 12, 140, 40, 10 //ICON LTEXT "Nome", 14005, 100, 140, 40, 10 PUSHBUTTON "&Cambia...", 14006, 180, 140, 50, 14, WS_TABSTOP @@ -777,4 +777,5 @@ IDS_FILE_DETAILSADV "I files con estensione '%s' sono di tipo '%s'. Per modificare le impostazioni per tutti i file '%s', cliccare su Avanzate." IDS_FILE_TYPES "Tipi di file" IDS_COLUMN_EXTENSION "Estensioni" -END + IDS_BYTES_FORMAT "byte" +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "æ¡å¼µå '%s' ã®ãã¡ã¤ã«ã®ç¨®é¡ã¯'%s'ã§ãã '%s' ã®ãã¡ã¤ã«ãã¹ã¦ã«å¯¾ããè¨å®ãå¤æ´ããã«ã¯ è©³ç´°è¨å®ãã¯ãªãã¯ãã¦ãã ããã" IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -769,4 +769,5 @@ IDS_FILE_DETAILSADV "Filer med utvidelser '%s' er av typen '%s'. For Ã¥ endre innstillingene som er av filen '%s', trykk pÃ¥ avansert." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -774,4 +774,5 @@ IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' sÄ typu '%s'. Aby zmieniÄ ustawienia, ktÃ³re dotyczÄ wszystkich plikÃ³w '%s', kliknij przycisk Zaawansowane." IDS_FILE_TYPES "Typy plikÃ³w" IDS_COLUMN_EXTENSION "Rozszerzenia" -END + IDS_BYTES_FORMAT "bajtÃ³w" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -768,4 +768,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -769,4 +769,5 @@ IDS_FILE_DETAILSADV "Ficheiros com extensÃ£o '%s' sÃ£o do tipo '%s'. Para mudar definiÃ§Ãµes que afectam todos '%s' ficheiros, click AvanÃ§ado." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,5 +766,6 @@ IDS_FILE_DETAILSADV "FiÈierele cu extensia '%s' sunt de tipul '%s'. Pentru a schimbat setÄri care vor afecta toate fiÈierele '%s', clic pe Avansat." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END - + IDS_BYTES_FORMAT "bytes" +END + Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -765,4 +765,5 @@ IDS_FILE_DETAILSADV "Ð¤Ð°Ð¹Ð»Ñ Ñ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÐµÐ¼ '%s' Ð¸Ð¼ÐµÑÑ ÑÐ¸Ð¿ '%s'. ÐÐ»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð²ÑÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð² '%s', Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ 'ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾'." IDS_FILE_TYPES "Ð¢Ð¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²" IDS_COLUMN_EXTENSION "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -774,4 +774,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,4 +766,5 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -779,4 +779,5 @@ IDS_FILE_DETAILSADV "Ð¤Ð°Ð¹Ð»Ð¸ Ð· ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½ÑÐ¼ '%s' Ð¼Ð°ÑÑÑ ÑÐ¸Ð¿ '%s'. Ð©Ð¾Ð± Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸, ÑÐºÑ Ð²Ð¿Ð»Ð¸Ð²Ð°ÑÐ¸Ð¼ÑÑÑ Ð½Ð° Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¸ '%s', Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ 'ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾'." IDS_FILE_TYPES "Ð¢Ð¸Ð¿Ð¸ Ð¤Ð°Ð¹Ð»ÑÐ²" IDS_COLUMN_EXTENSION "Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ" -END + IDS_BYTES_FORMAT "bytes" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -754,5 +754,6 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END - + IDS_BYTES_FORMAT "bytes" +END + Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -766,5 +766,6 @@ IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" -END - + IDS_BYTES_FORMAT "bytes" +END + Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -46,6 +46,7 @@ #include <sddl.h> #include <tchar.h> +#include <strsafe.h> #include <atlbase.h> #include <atlcom.h> #include <atlwin.h> Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.cpp [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -523,12 +523,12 @@ if (poainfo->pcszFile) { szBuffer[0] = L'\0'; - SendDlgItemMessageW(hwndDlg, 14001, WM_GETTEXT, sizeof(szBuffer), (LPARAM)szBuffer); + GetDlgItemTextW(hwndDlg, 14001, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0])); index = wcslen(szBuffer); if (index + wcslen(poainfo->pcszFile) + 1 < sizeof(szBuffer)/sizeof(szBuffer[0])) wcscat(szBuffer, poainfo->pcszFile); szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, 0, (LPARAM)szBuffer); + SetDlgItemTextW(hwndDlg, 14001, szBuffer); ZeroMemory(&Context, sizeof(OPEN_WITH_CONTEXT)); Context.hDlgCtrl = GetDlgItem(hwndDlg, 14002); LoadOWItems(&Context, poainfo->pcszFile); Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -217,7 +217,7 @@ BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); BOOL SH_ShowPropertiesDialog(LPWSTR lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); BOOL SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); - +LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf); EXTERN_C HRESULT WINAPI DoRegisterServer(void); EXTERN_C HRESULT WINAPI DoUnregisterServer(void); Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -2033,8 +2033,7 @@ wchar_t * wTrgtLocat; const int ch = '\\'; wTrgtLocat = wcsrchr(pThis->sWorkDir, ch)+1; - hDlgCtrl = GetDlgItem( hwndDlg, 14007 ); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)wTrgtLocat); + SetDlgItemTextW(hwndDlg, 14007, wTrgtLocat); /* target path */ hDlgCtrl = GetDlgItem( hwndDlg, 14009 ); @@ -2058,12 +2057,10 @@ if ( lppsn->hdr.code == PSN_APPLY ) { /* set working directory */ - hDlgCtrl = GetDlgItem( hwndDlg, 14011 ); - SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer ); + GetDlgItemTextW(hwndDlg, 14011, szBuffer, MAX_PATH); pThis->SetWorkingDirectory(szBuffer); /* set link destination */ - hDlgCtrl = GetDlgItem( hwndDlg, 14009 ); - SendMessageW( hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)szBuffer); + GetDlgItemTextW(hwndDlg, 14009, szBuffer, MAX_PATH); if ( !SHELL_ExistsFileW(szBuffer) ) { //FIXME load localized error msg Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -612,7 +612,7 @@ to = &Context->to->feFiles[Context->Index]; /* update status */ - SendDlgItemMessageW(Context->hwndDlg, 14001, WM_SETTEXT, 0, (LPARAM)from->szFullPath); + SetDlgItemTextW(Context->hwndDlg, 14001, from->szFullPath); if (Context->op->req->wFunc == FO_COPY) { Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Nov 28 21:54:45 2011 @@ -136,6 +136,7 @@ #define IDS_FILE_TYPES 174 #define IDS_FILE_DETAILS 175 #define IDS_FILE_DETAILSADV 176 +#define IDS_BYTES_FORMAT 177 #define IDS_RUNDLG_ERROR 180 #define IDS_RUNDLG_BROWSE_ERROR 181

1 0

[fireball] 54528: [NTOS] - Nikolay Myltsev: Fix incorrect balancer thread id check. See issue #5857 for more details.
by fireball＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: fireball Date: Mon Nov 28 19:53:38 2011 New Revision: 54528 URL: http://svn.reactos.org/svn/reactos?rev=54528&view=rev Log: [NTOS] - Nikolay Myltsev: Fix incorrect balancer thread id check. See issue #5857 for more details. Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Mon Nov 28 19:53:38 2011 @@ -216,8 +216,8 @@ static BOOLEAN MiIsBalancerThread(VOID) { - return MiBalancerThreadHandle != NULL && - PsGetCurrentThread() == MiBalancerThreadId.UniqueThread; + return (MiBalancerThreadHandle != NULL) && + (PsGetCurrentThreadId() == MiBalancerThreadId.UniqueThread); } NTSTATUS

1 0

[rharabien] 54527: [SHELL32] - Use string IDs from rgs files - Improve Polish translation
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 11:21:15 2011 New Revision: 54527 URL: http://svn.reactos.org/svn/reactos?rev=54527&view=rev Log: [SHELL32] - Use string IDs from rgs files - Improve Polish translation Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Nov 28 11:21:15 2011 @@ -713,7 +713,7 @@ IDS_COMMON_PICTURES "Dokumenty\\Moje obrazy" IDS_COMMON_VIDEO "Dokumenty\\Moje wideo" IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dyskÃ³w CD" - IDS_NETWORKPLACE "Moja sieÄ" + IDS_NETWORKPLACE "Moje miejsca sieciowe" IDS_NEWFOLDER "Nowy katalog" Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] Mon Nov 28 11:21:15 2011 @@ -2,7 +2,7 @@ { NoRemove CLSID { - ForceRemove {645FF040-5081-101B-9F08-00AA002F954E} + ForceRemove {645FF040-5081-101B-9F08-00AA002F954E} = s 'Trash' { val 'InfoTip' = e '@%%SystemRoot%%\system32\SHELL32.dll,-22915' val 'IntroText' = e '@%%SystemRoot%%\system32\SHELL32.dll,-31748' Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Nov 28 11:21:15 2011 @@ -42,7 +42,6 @@ #define IDS_SHV_COLUMN_DELDATE 19 #define IDS_DESKTOP 20 -#define IDS_MYCOMPUTER 21 #define IDS_SELECT 22 #define IDS_OPEN 23 @@ -57,7 +56,6 @@ #define IDS_SHUTDOWN_PROMPT 43 #define IDS_PROGRAMS 45 -#define IDS_PERSONAL 46 #define IDS_FAVORITES 47 #define IDS_STARTUP 48 #define IDS_RECENT 49 @@ -86,9 +84,6 @@ #define IDS_DRIVE_FIXED 72 #define IDS_DRIVE_CDROM 73 #define IDS_DRIVE_NETWORK 74 -#define IDS_NETWORKPLACE 75 -#define IDS_FONTS 76 -#define IDS_PRINTERS 77 #define IDS_LOGOFF_TITLE 78 #define IDS_LOGOFF_PROMPT 79 @@ -115,7 +110,6 @@ #define FCIDM_SHVIEW_VIEW 147 #define IDS_CONTROLPANEL 148 #define IDS_NEWFOLDER 149 -#define IDS_FOLDER_OPTIONS 150 #define IDS_COLUMN_EXTENSION 151 #define IDS_NO_EXTENSION 152 #define IDS_RECYCLEBIN_LOCATION 153 @@ -174,15 +168,21 @@ #define IDS_CUT 324 #define IDS_RESTORE 325 #define IDS_DEFAULT_CLUSTER_SIZE 326 -#define IDS_ADMINISTRATIVETOOLS 327 #define IDS_FORMATDRIVE 328 #define IDS_RENAME 329 #define IDS_INSERT 330 #define IDS_DESCRIPTION 331 #define IDS_COPY_OF 332 -/* Note: this string is referenced from the registry */ -#define IDS_RECYCLEBIN_FOLDER_NAME 8964 +/* Note: those strings are referenced from the registry */ +#define IDS_RECYCLEBIN_FOLDER_NAME 8964 +#define IDS_ADMINISTRATIVETOOLS 22982 +#define IDS_FOLDER_OPTIONS 22985 +#define IDS_FONTS 22981 +#define IDS_PRINTERS 9319 +#define IDS_MYCOMPUTER 9216 +#define IDS_PERSONAL 9227 +#define IDS_NETWORKPLACE 9217 #define IDD_ICON 0x4300 #define IDD_MESSAGE 0x4301

1 0

[rharabien] 54526: [SHELL32] - Improve Polish translation of Folder Options - Fix Start Menu folder having name "Menu" in Polish translation
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 10:46:11 2011 New Revision: 54526 URL: http://svn.reactos.org/svn/reactos?rev=54526&view=rev Log: [SHELL32] - Improve Polish translation of Folder Options - Fix Start Menu folder having name "Menu" in Polish translation Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Nov 28 10:46:11 2011 @@ -394,19 +394,19 @@ BEGIN GROUPBOX "Zadania", -1, 7, 10, 249, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "PokaÅ¼ podstawowe zadania w &katalogach", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "UÅ¼yj klasycznych katalogÃ³w &ReactOS", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "PokaÅ¼ podstawowe zadania w &katalogach", 14001, 40, 25, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "UÅ¼yj klasycznych katalogÃ³w &ReactOS", 14002, 40, 37, 180, 10, WS_TABSTOP | WS_GROUP GROUPBOX "PrzeglÄdaj katalogi", -1, 7, 60, 249, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "OtwÃ³rz kaÅ¼dy katalog w tym &samym oknie", 14004, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "OtwÃ³rz kaÅ¼dy katalog w &osobnym oknie", 14005, 40, 82, 140, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "OtwÃ³rz kaÅ¼dy katalog w tym &samym oknie", 14004, 40, 70, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "OtwÃ³rz kaÅ¼dy katalog w &osobnym oknie", 14005, 40, 82, 180, 10, WS_TABSTOP | WS_GROUP GROUPBOX "DziaÅanie przyciskÃ³w myszki", -1, 7, 110, 249, 60 ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "&Pojedyncze klikniÄcie by otworzyÄ cel (najechanie by wskazaÄ)", 14007, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "PodkreÅ&laj tytuÅy ikon tak jak w przeglÄdarce", 14008, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "PodkreÅlaj &tytuÅy ikon tylko po najechaniu na nie kursorem", 14009, 50, 144, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Po&dwÃ³jne klikniÄcie by otworzyÄ (pojedyncze klikniÄcie by wskazaÄ)", 14010, 40, 156, 170, 10, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&Ustawienia domyÅlne", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "&Pojedyncze klikniÄcie by otworzyÄ cel (najechanie by wskazaÄ)", 14007, 40, 120, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "PodkreÅ&laj tytuÅy ikon tak jak w przeglÄdarce", 14008, 50, 132, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "PodkreÅlaj &tytuÅy ikon tylko po najechaniu na nie kursorem", 14009, 50, 144, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Po&dwÃ³jne klikniÄcie by otworzyÄ (pojedyncze klikniÄcie by wskazaÄ)", 14010, 40, 156, 180, 10, WS_TABSTOP | WS_GROUP + PUSHBUTTON "PrzywrÃ³Ä &domyÅlne", 14011, 180, 180, 80, 14, WS_TABSTOP END FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 @@ -416,12 +416,12 @@ BEGIN GROUPBOX "PodglÄd folderÃ³w", -1, 7, 10, 249, 60 //ICON -LTEXT "MoÅ¼esz uÅ¼yÄ podglÄdÃ³w (takich jak Detale lub TytuÅy) ktÃ³re\nsÄ ustawione dla tego katalogu, dla pozostaÅych.", -1, 60, 20, 180, 20 -PUSHBUTTON "Zastosuj do w&szystkich KatalogÃ³w", 14001, 60, 50, 80, 14, WS_TABSTOP +LTEXT "MoÅ¼esz uÅ¼yÄ podglÄdÃ³w (takich jak Detale lub TytuÅy)\nktÃ³re sÄ ustawione dla tego katalogu, dla pozostaÅych.", -1, 20, 20, 210, 20 +PUSHBUTTON "Zastosuj do w&szystkich KatalogÃ³w", 14001, 50, 50, 80, 14, WS_TABSTOP PUSHBUTTON "Z&resetuj ustawienia", 14002, 150, 50, 80, 14, WS_TABSTOP LTEXT "Zaawansowane:", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "OdtwÃ³rz &domyÅlne", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "PrzywrÃ³Ä &domyÅlne", 14004, 180, 210, 90, 14, WS_TABSTOP END FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 @@ -429,17 +429,17 @@ CAPTION "Typy plikÃ³w" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -LTEXT "Zarejestruj &typy plikÃ³w:", -1, 7, 10, 70, 10 +LTEXT "Zarejestrowane &typy plikÃ³w:", -1, 7, 10, 196, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&Nowy", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Skasuj", 14002, 180, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "&Nowy", 14001, 120, 110, 60, 14, WS_TABSTOP +PUSHBUTTON "&Skasuj", 14002, 180, 110, 60, 14, WS_TABSTOP GROUPBOX "SzczegÃ³Åy dla rozszerzenia '%s'", 14003, 7, 130, 249, 70 LTEXT "Otwiera z:", -1, 12, 140, 40, 10 //ICON -LTEXT "Nazwa Aplikacji", 14005, 100, 140, 40, 10 -PUSHBUTTON "Z&mieÅ", 14006, 180, 140, 50, 14, WS_TABSTOP +LTEXT "Nazwa Aplikacji", 14005, 100, 140, 80, 10 +PUSHBUTTON "Z&mieÅ", 14006, 190, 140, 60, 14, WS_TABSTOP LTEXT "", 14007, 12, 155, 160, 30 -PUSHBUTTON "Zaawa&nsowane", 14008, 180, 175, 50, 14, WS_TABSTOP +PUSHBUTTON "Zaawa&nsowane", 14008, 190, 175, 60, 14, WS_TABSTOP END CONFIRM_FILE_REPLACE_DLG DIALOGEX 0, 0, 282, 143 @@ -692,7 +692,7 @@ IDS_STARTUP "Menu Start\\Programy\\AutoStart" IDS_RECENT "Ostatnie" IDS_SENDTO "WyÅlij do" - IDS_STARTMENU "Menu" + IDS_STARTMENU "Menu Start" IDS_MYMUSIC "Moja muzyka" IDS_MYVIDEO "Moje wideo" IDS_DESKTOPDIRECTORY "Pulpit" @@ -729,7 +729,7 @@ FCIDM_SHVIEW_NEW "&Nowy" FCIDM_SHVIEW_NEWFOLDER "&Folder" FCIDM_SHVIEW_NEWLINK "&SkrÃ³t" - IDS_FOLDER_OPTIONS "Opcje katalogÃ³w" + IDS_FOLDER_OPTIONS "Opcje folderÃ³w" IDS_RECYCLEBIN_LOCATION "Lokalizacja kosza" IDS_RECYCLEBIN_DISKSPACE "PozostaÅo wolnego miejsca" IDS_EMPTY_BITBUCKET "OprÃ³Å¼nij Kosz"

1 0

[rharabien] 54525: [CALC] - Fix buttons misalignment. Patch by Fulea Stefan.
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

1 0

[rharabien] 54524: [DESK] - Improve Polish translation
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 10:22:27 2011 New Revision: 54524 URL: http://svn.reactos.org/svn/reactos?rev=54524&view=rev Log: [DESK] - Improve Polish translation Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Mon Nov 28 10:22:27 2011 @@ -40,16 +40,16 @@ PUSHBUTTON "&Ustawienia", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "&PodglÄd", IDC_SCREENS_TESTSC, 175, 103, 50, 13 LTEXT "&Czekaj", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + EDITTEXT IDC_SCREENS_TIMEDELAY, 35, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 54, 123, 12, 13 + WS_BORDER | WS_GROUP, 55, 123, 12, 13 LTEXT "minut", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Ochrona &hasÅem.", IDC_SCREENS_USEPASSCHK, "button", + CONTROL "Po wznowieniu chroÅ &hasÅem", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "&Zasilanie monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Kliknij przycisk Zasilanie, aby dopasowaÄ ustawienia zasilania dla monitora i oszczÄdzanie energii.", - IDC_STATIC, 14, 166, 146, 20 + IDC_STATIC, 14, 166, 146, 25 PUSHBUTTON "Z&asilanie...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 END

1 0

[rharabien] 54523: [SHELL32] - Don't fail if Shell folder cannot be created. This way shell registers more folders on LiveCD.
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 10:01:24 2011 New Revision: 54523 URL: http://svn.reactos.org/svn/reactos?rev=54523&view=rev Log: [SHELL32] - Don't fail if Shell folder cannot be created. This way shell registers more folders on LiveCD. Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Mon Nov 28 10:01:24 2011 @@ -1563,13 +1563,15 @@ hr = HRESULT_FROM_WIN32(ret); else { - hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, - hToken, SHGFP_TYPE_DEFAULT, path); - ret = RegSetValueExW(hKey, - CSIDL_Data[folders[i]].szValueName, 0, REG_SZ, - (LPBYTE)path, (wcslen(path) + 1) * sizeof(WCHAR)); - if (ret) - hr = HRESULT_FROM_WIN32(ret); + // Don't fail if folder can't be created + if (SUCCEEDED(SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, + hToken, SHGFP_TYPE_DEFAULT, path))) + { + ret = RegSetValueExW(hKey, CSIDL_Data[folders[i]].szValueName, 0, REG_SZ, + (LPBYTE)path, (wcslen(path) + 1) * sizeof(WCHAR)); + if (ret) + hr = HRESULT_FROM_WIN32(ret); + } } } }

1 0

[rharabien] 54522: [LIVECD] - Add registration to LiveCD. Fixes #6597, #6613 and probably some more
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 09:53:01 2011 New Revision: 54522 URL: http://svn.reactos.org/svn/reactos?rev=54522&view=rev Log: [LIVECD] - Add registration to LiveCD. Fixes #6597, #6613 and probably some more Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Mon Nov 28 09:53:01 2011 @@ -721,6 +721,24 @@ if (!CommonInstall()) goto error; + + /* Register components */ + _SEH2_TRY + { + if (!SetupInstallFromInfSectionW(NULL, + hSysSetupInf, L"RegistrationPhase2", + SPINST_ALL, + 0, NULL, 0, NULL, NULL, NULL, NULL)) + { + DPRINT1("SetupInstallFromInfSectionW failed!\n"); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Catching exception\n"); + } + _SEH2_END; + SetupCloseInfFile(hSysSetupInf); /* Run the shell */

1 0

[rharabien] 54521: [RBUILD] - Create livecd shortcuts on rbuild too
by rharabien＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: rharabien Date: Mon Nov 28 09:46:59 2011 New Revision: 54521 URL: http://svn.reactos.org/svn/reactos?rev=54521&view=rev Log: [RBUILD] - Create livecd shortcuts on rbuild too Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -152,7 +152,25 @@ } string -v2s ( const Backend* backend, const vector<FileLocation>& files, int wrap_at ) +MingwBackend::GetFullNamePrefixSpaces ( const FileLocation& file ) const +{ + string fullname = GetFullName ( file ); + + size_t pos = 0; + while ( true ) + { + pos = fullname.find ( ' ', pos ); + if ( pos == fullname.npos ) + break; + fullname.replace ( pos, 1, "\\ " ); + pos += 2; + } + + return fullname; +} + +string +MingwBackend::v2s ( const vector<FileLocation>& files, int wrap_at, bool prefixSpaces ) const { if ( !files.size() ) return ""; @@ -168,14 +186,16 @@ } else if ( s.size() ) s += " "; - s += backend->GetFullName ( file ); + if (prefixSpaces) + s += GetFullNamePrefixSpaces ( file ); + else + s += GetFullName ( file ); } return s; } - -string -v2s ( const string_list& v, int wrap_at ) +string +MingwBackend::v2s ( const string_list& v, int wrap_at ) const { if ( !v.size() ) return ""; @@ -196,7 +216,6 @@ } return s; } - static class MingwFactory : public Backend::Factory { @@ -1274,7 +1293,7 @@ registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "software" ) ); registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "system" ) ); - return v2s( this, registry_files, 6 ); + return v2s( registry_files, 6, true ); } void @@ -1307,7 +1326,7 @@ { vector<FileLocation> vInstallTargetFiles; GetInstallTargetFiles ( vInstallTargetFiles ); - string installTargetFiles = v2s ( this, vInstallTargetFiles, 5 ); + string installTargetFiles = v2s ( vInstallTargetFiles, 5, true ); string registryTargetFiles = GetRegistryTargetFiles (); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -29,11 +29,6 @@ class Directory; class MingwModuleHandler; -extern std::string -v2s ( const Backend* backend, const std::vector<FileLocation>& files, int wrap_at ); -extern std::string -v2s ( const string_list& v, int wrap_at ); - class MingwBackend : public Backend { @@ -59,8 +54,11 @@ std::string GetFullName ( const FileLocation& file ) const; std::string GetFullPath ( const FileLocation& file ) const; + std::string GetFullNamePrefixSpaces ( const FileLocation& file ) const; std::string GetRegistrySourceFiles () const; std::string GetRegistryTargetFiles () const; + std::string v2s ( const std::vector<FileLocation>& files, int wrap_at, bool prefixSpaces = false ) const; + std::string v2s ( const string_list& v, int wrap_at ) const; private: void CreateMakefile (); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -281,7 +281,7 @@ const File& file = *compilationUnit.GetFiles ()[i]; sourceFiles.push_back ( backend->GetFullName ( file.file ) ); } - return string ( " " ) + v2s ( sourceFiles, 10 ); + return string ( " " ) + backend->v2s ( sourceFiles, 10 ); } /* caller needs to delete the returned object */ @@ -322,7 +322,7 @@ fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, - "\t${cp} %s %s 1>$(NUL)\n", + "\t${cp} \"%s\" \"%s\" 1>$(NUL)\n", backend->GetFullName ( source ).c_str (), backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } @@ -333,12 +333,12 @@ { fprintf ( fMakefile, "%s : %s\n", - backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str (), - backend->GetFullName ( source ).c_str () ); + backend->GetFullNamePrefixSpaces ( *PassThruCacheDirectory ( &destination ) ).c_str (), + backend->GetFullNamePrefixSpaces ( source ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, - "\t${cp} %s %s 1>$(NUL)\n", + "\t${cp} \"%s\" \"%s\" 1>$(NUL)\n", backend->GetFullName ( source ).c_str (), backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } @@ -508,7 +508,7 @@ fprintf ( fMakefile, "%s: %s\n\t-@${rm}", GetModuleCleanTarget ( module ).c_str(), - v2s ( referencedModuleNames, 10 ).c_str () ); + backend->v2s ( referencedModuleNames, 10 ).c_str () ); for ( size_t i = 0; i < clean_files.size(); i++ ) { if ( ( i + 1 ) % 10 == 9 ) @@ -1196,7 +1196,7 @@ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); if ( rpcDependencies.size () > 0 ) - dependencies += " " + v2s ( backend, rpcDependencies, 5 ); + dependencies += " " + backend->v2s ( rpcDependencies, 5 ); rule->Execute ( fMakefile, backend, module, sourceFile, clean_files, dependencies ); } @@ -1536,7 +1536,7 @@ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); if ( rpcDependencies.size () > 0 ) - dependencies = " " + v2s ( backend, rpcDependencies, 5 ); + dependencies = " " + backend->v2s ( rpcDependencies, 5 ); if ( module.cplusplus ) pchCxxRule.Execute ( fMakefile, backend, module, module.pch->file, clean_files, dependencies ); @@ -2788,7 +2788,7 @@ fprintf( fMakefile, "\n%s_OBJS := %s\n\n", module.name.c_str (), - v2s ( backend, sourceFiles, 5 ).c_str () ); + backend->v2s ( sourceFiles, 5, true ).c_str () ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); @@ -2916,6 +2916,75 @@ } void +MingwLiveIsoModuleHandler::OutputMakeLinkCommand ( const string name, + const string application, + const string &path, + vector<FileLocation>& destinations ) +{ + FileLocation location ( OutputDirectory, path, name + ".lnk" ); + fprintf ( fMakefile, + "%s : $(mkshelllink_TARGET)\n", + backend->GetFullNamePrefixSpaces ( *PassThruCacheDirectory ( &location ) ).c_str () ); + fprintf ( fMakefile, + "\t$(Q)$(mkshelllink_TARGET) -o \"%s\" -g {450D8FBA-AD25-11D0-98A8-0800361B1103} -c %s -i %s -m livecd_start.cmd\n", + backend->GetFullName ( location ).c_str (), + application.c_str (), + application.c_str () ); + destinations.push_back ( location ); +} + +void +MingwLiveIsoModuleHandler::OutputShortcutCommands ( string& livecdDirectory, + vector<FileLocation>& destinations ) +{ + string allUsersDir = livecdDirectory + sSep + "Profiles" + sSep + "All Users"; + string defaultUserDir = livecdDirectory + sSep + "Profiles" + sSep + "Default User"; + FileLocation helperSource ( SourceDirectory, "boot" + sSep + "bootdata", "livecd_start.cmd" ); + FileLocation helperDest ( OutputDirectory, defaultUserDir + sSep + "My Documents", "livecd_start.cmd" ); + OutputCopyCommandSingle ( helperSource, helperDest ); + destinations.push_back ( helperDest ); + + string desktopDir = allUsersDir + sSep + "Desktop"; + OutputMakeLinkCommand ( "Command Prompt", "cmd.exe", desktopDir, destinations ); + + string startMenuDir = allUsersDir + sSep + "Start Menu"; + OutputMakeLinkCommand ( "ReactOS Explorer", "explorer.exe", startMenuDir + sSep + "Programs", destinations ); + + string adminToolsDir = startMenuDir + sSep + "Programs" + sSep + "Administrative Tools"; + OutputMakeLinkCommand ( "Device Manager", "devmgmt.exe", adminToolsDir, destinations ); + OutputMakeLinkCommand ( "Event Viewer", "eventvwr.exe", adminToolsDir, destinations ); + OutputMakeLinkCommand ( "Service Manager", "servman.exe", adminToolsDir, destinations ); + OutputMakeLinkCommand ( "System Configuration", "msconfig.exe", adminToolsDir, destinations ); + + string accessibilityDir = startMenuDir + sSep + "Programs" + sSep + "Accessibility"; + OutputMakeLinkCommand ( "Magnify", "magnify.exe", accessibilityDir, destinations ); + + string accessoriesDir = startMenuDir + sSep + "Programs" + sSep + "Accessories"; + OutputMakeLinkCommand ( "Calculator", "calc.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Command Prompt", "cmd.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Paint", "mspaint.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Notepad", "notepad.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "Remote desktop", "mstsc.exe", accessoriesDir, destinations ); + OutputMakeLinkCommand ( "WordPad", "wordpad.exe", accessoriesDir, destinations ); + + string entertainmentDir = startMenuDir + sSep + "Programs" + sSep + "Entertainment"; + OutputMakeLinkCommand ( "Audiorecorder", "sndrec32.exe", entertainmentDir, destinations ); + OutputMakeLinkCommand ( "Multimedia Player", "mplay32.exe", entertainmentDir, destinations ); + OutputMakeLinkCommand ( "Volume Control", "sndvol32.exe", entertainmentDir, destinations ); + + string gamesDir = startMenuDir + sSep + "Programs" + sSep + "Games"; + OutputMakeLinkCommand ( "Solitaire", "sol.exe", gamesDir, destinations ); + OutputMakeLinkCommand ( "Spider Solitaire", "spider.exe", gamesDir, destinations ); + OutputMakeLinkCommand ( "WineMine", "winmine.exe", gamesDir, destinations ); + + string sysToolsDir = startMenuDir + sSep + "Programs" + sSep + "System Tools"; + OutputMakeLinkCommand ( "Character Map", "charmap.exe", sysToolsDir, destinations ); + OutputMakeLinkCommand ( "Keyboard Layout Switcher", "kbswitch.exe", sysToolsDir, destinations ); + OutputMakeLinkCommand ( "ReactX Diagnostic", "dxdiag.exe", sysToolsDir, destinations ); + OutputMakeLinkCommand ( "Regedit", "regedit.exe", sysToolsDir, destinations ); +} + +void MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory ) { string registrySourceFiles = backend->GetRegistrySourceFiles (); @@ -2926,7 +2995,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(mkhive_TARGET) %s %s boot%cbootdata%clivecd.inf\n", + "\t$(Q)$(mkhive_TARGET) %s %s boot%cbootdata%clivecd.inf\n", backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), registrySourceFiles.c_str(), cSep, cSep ); @@ -2976,11 +3045,12 @@ sourceFiles ); OutputProfilesDirectoryCommands ( livecdDirectory, sourceFiles ); OutputLoaderCommands ( livecdDirectory, sourceFiles ); + OutputShortcutCommands ( livecdDirectory, sourceFiles ); fprintf( fMakefile, "\n%s_OBJS := %s\n\n", module.name.c_str (), - v2s ( backend, sourceFiles, 5 ).c_str () ); + backend->v2s ( sourceFiles, 5, true ).c_str () ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Mon Nov 28 09:46:59 2011 @@ -335,6 +335,12 @@ std::vector<FileLocation>& destinations ); void OutputLoaderCommands ( std::string& livecdDirectory, std::vector<FileLocation>& destinations ); + void OutputMakeLinkCommand ( const std::string name, + const std::string application, + const std::string &path, + std::vector<FileLocation>& destinations ); + void OutputShortcutCommands ( std::string& livecdDirectory, + std::vector<FileLocation>& destinations ); void OutputRegistryCommands ( std::string& livecdDirectory ); };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs