Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 32703: - fix compilation with msvc
by janderwald＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: janderwald Date: Sun Mar 16 14:19:26 2008 New Revision: 32703 URL: http://svn.reactos.org/svn/reactos?rev=3D32703&view=3Drev Log: - fix compilation with msvc Modified: trunk/reactos/dll/cpl/intl/advanced.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced= .c?rev=3D32703&r1=3D32702&r2=3D32703&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/intl/advanced.c (original) +++ trunk/reactos/dll/cpl/intl/advanced.c Sun Mar 16 14:19:26 2008 @@ -28,6 +28,8 @@ INFCONTEXT infCont; LPCPAGE lpCPage; HANDLE hCPage; + CPINFOEX cpInfEx; + TCHAR Section[MAX_PATH]; = Count =3D (UINT) SetupGetLineCount(hIntlInf, _T("CodePages")); if (Count <=3D 0) return FALSE; @@ -45,7 +47,6 @@ lpCPage->Status =3D 0; (lpCPage->Name)[0] =3D 0; = - CPINFOEX cpInfEx; if (GetCPInfoEx(uiCPage, 0, &cpInfEx)) { _tcscpy(lpCPage->Name, cpInfEx.CodePageName); @@ -57,7 +58,6 @@ continue; } = - TCHAR Section[MAX_PATH]; _stprintf(Section, _T("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage= ); if ((uiCPage =3D=3D GetACP()) || (uiCPage =3D=3D GetOEMCP()) |= | = (!SetupFindFirstLine(hIntlInf, Section, _T("AddReg"), &inf= Cont))) @@ -101,6 +101,9 @@ LPCPAGE lpCPage; INT ItemIndex; HWND hList; + LV_COLUMN column; + LV_ITEM item; + RECT ListRect; = hList =3D GetDlgItem(hwndDlg, IDC_CONV_TABLES); = @@ -120,10 +123,6 @@ SetupCloseInfFile(hIntlInf); = if (!EnumSystemCodePages(InstalledCPProc, CP_INSTALLED)) return; - - LV_COLUMN column; - LV_ITEM item; - RECT ListRect; = ZeroMemory(&column, sizeof(LV_COLUMN)); column.mask =3D LVCF_FMT|LVCF_TEXT|LVCF_WIDTH;

1 0

[janderwald] 32702: - make desk strict ANSI-C compilable - do not disable color changer when a background image is selected
by janderwald＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: janderwald Date: Sun Mar 16 13:29:28 2008 New Revision: 32702 URL: http://svn.reactos.org/svn/reactos?rev=3D32702&view=3Drev Log: - make desk strict ANSI-C compilable - do not disable color changer when a background image is selected Modified: trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/general.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/backgrou= nd.c?rev=3D32702&r1=3D32701&r2=3D32702&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sun Mar 16 13:29:28 2008 @@ -481,8 +481,6 @@ InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), NULL, TRUE); = - EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_BUTTON), - (backgroundItem->bWallpaper =3D=3D FALSE ? TRUE : FALSE)); EnableWindow(GetDlgItem(hwndDlg, IDC_PLACEMENT_COMBO), backgroundItem->bWallpaper); = Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.= c?rev=3D32702&r1=3D32701&r2=3D32702&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/desk/general.c (original) +++ trunk/reactos/dll/cpl/desk/general.c Sun Mar 16 13:29:28 2008 @@ -15,6 +15,7 @@ HWND hFontSize; INFCONTEXT Context; int i, ci =3D 0; + DWORD dwSize, dwValue, dwType; = hFontSize =3D GetDlgItem(hWnd, IDC_FONTSIZE_COMBO); = @@ -39,7 +40,8 @@ if (i !=3D CB_ERR) SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, = (LPARAM)ci); = - DWORD dwSize =3D MAX_PATH, dwValue, dwType =3D REG_DWO= RD; + dwSize =3D MAX_PATH; + dwType =3D REG_DWORD; = if (RegQueryValueEx(hKey, _T("LogPixels"), NULL, &dwType, (LPBYTE)&dwValue, &dwSize= ) =3D=3D ERROR_SUCCESS)

1 0

[janderwald] 32701: - the color of the background for the desktop window should match COLOR_DESKTOP
by janderwald＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: janderwald Date: Sun Mar 16 13:19:36 2008 New Revision: 32701 URL: http://svn.reactos.org/svn/reactos?rev=3D32701&view=3Drev Log: - the color of the background for the desktop window should match COLOR_DES= KTOP Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shl= view.c?rev=3D32701&r1=3D32700&r2=3D32701&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Sun Mar 16 13:19:36 2008 @@ -1924,7 +1924,7 @@ wc.hInstance =3D shell32_hInstance; wc.hIcon =3D 0; wc.hCursor =3D LoadCursorW(0, (LPWSTR)IDC_ARROW); - wc.hbrBackground =3D (HBRUSH) (COLOR_WINDOW + 1); + wc.hbrBackground =3D (HBRUSH) (COLOR_BACKGROUND+1); wc.lpszMenuName =3D NULL; wc.lpszClassName =3D SV_CLASS_NAME; =

1 0

[cfinck] 32700: Winebuild files don't need to depend on $(module_precondition) Fixes some more circular dependencies
by cfinck＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: cfinck Date: Sun Mar 16 12:10:46 2008 New Revision: 32700 URL: http://svn.reactos.org/svn/reactos?rev=3D32700&view=3Drev Log: Winebuild files don't need to depend on $(module_precondition) Fixes some more circular dependencies Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32700&r1=3D32699&r2=3D32700&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Mar 16 1= 2:10:46 2008 @@ -1280,7 +1280,7 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) ${$(module_name)_precondition}$(dependencies) = $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) $(dependencies) $(WINEBUILD_TARGET) | $(INTERM= EDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n"

1 0

[janderwald] 32699: - initialize bitbucket properties dialog - fix resources - partly implement THRASH_CanTrashFile
by janderwald＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: janderwald Date: Sun Mar 16 09:55:04 2008 New Revision: 32699 URL: http://svn.reactos.org/svn/reactos?rev=3D32699&view=3Drev Log: - initialize bitbucket properties dialog - fix resources - partly implement THRASH_CanTrashFile Modified: 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/eo-EO.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-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.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/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/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/bg-BG.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "=C3=90=C3=A0=C3=A7=C3=AC=C3=A5=C3=B0 =C3=A4=C3=AE (=C3=8C=C3=81):"= , -1, 20, 105, 70, 10 RADIOBUTTON "=C3=94=C3=A0=C3=A9=C3=AB=C3=AE=C3=A2=C3=A5=C3=B2=C3=A5 =C3= =B1=C3=A5 =C3=A8=C3=A7=C3=B2=C3=B0=C3=A8=C3=A2=C3=A0=C3=B2 =C3=A2=C3=A5=C3= =A4=C3=AD=C3=A0=C3=A3=C3=A0, =C3=A1=C3=A5=C3=A7 =C3=A4=C3=A0 =C3=B1=C3=A5 = =C3=AC=C3=A5=C3=B1=C3=B2=C3=BF=C3=B2 =C3=A2 =C3=AA=C3=AE=C3=B8=C3=B7=C3=A5= =C3=B2=C3=AE.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&=C3=8F=C3=A8=C3=B2=C3=A0=C3=AD=C3=A5 =C3=AF=C3=B0=C3=A5=C3= =A4=C3=A8 =C3=A8=C3=A7=C3=B2=C3=B0=C3=A8=C3=A2=C3=A0=C3=AD=C3=A5", 14004, 2= 0, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&=C3=8F=C3=A8=C3=B2=C3=A0=C3=AD=C3=A5 =C3=AF=C3=B0=C3=A5=C3= =A4=C3=A8 =C3=A8=C3=A7=C3=B2=C3=B0=C3=A8=C3=A2=C3=A0=C3=AD=C3=A5", 14004, 2= 0, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -647,6 +647,8 @@ FCIDM_SHVIEW_NEWFOLDER "=C3=8D=C3=AE=C3=A2=C3=A0 &=C3=AF=C3=A0=C3=AF= =C3=AA=C3=A0" FCIDM_SHVIEW_NEWLINK "=C3=8D=C3=AE=C3=A2=C3=A0 &=C3=A2=C3=B0=C3=BA= =C3=A7=C3=AA=C3=A0" IDS_FOLDER_OPTIONS "=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9= =C3=AA=C3=A8 =C3=AD=C3=A0 =C3=AF=C3=A0=C3=AF=C3=AA=C3=A8=C3=B2=C3=A5" -END - - + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" +END + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ca-ES.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/cs-CZ.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,4 +644,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nov=C3=A1 &slo=C2=9Eka" FCIDM_SHVIEW_NEWLINK "Nov=C3=BD &z=C3=A1stupce" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/da-DK.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/de-DE.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximale Gr=C3=B6=C3=9Fe (MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Dateien nicht in den Papie&rkorb verschieben, sondern sofort= l=C3=B6schen", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "Best=C3=A4tigungs&dialog nach erfolgreichem L=C3=B6schvorgan= g anzeigen", 14004, 20, 155, 215, 10, WS_TABSTOP + AUTOCHECKBOX "Best=C3=A4tigungs&dialog nach erfolgreichem L=C3=B6schvorga= ng anzeigen", 14004, 20, 155, 215, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" IDS_FOLDER_OPTIONS "Ordneroptionen" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/el-GR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 110, 90, 50, 10, WS_TABSTOP | ES_NUMBER LTEXT "=C3=8C=C3=9D=C3=A3=C3=A9=C3=B3=C3=B4=C3=AF =C3=AC=C3=9D=C3=A3=C3= =A5=C3=A8=C3=AF=C3=B2 (MB):", -1, 20, 100, 100, 10 RADIOBUTTON "=C3=8D=C3=A1 =C3=AC=C3=A7=C3=AD =C3=AC=C3=A5=C3=B4=C3=A1=C3= =AA=C3=A9=C3=AD=C3=AF=C3=BD=C3=AD=C3=B4=C3=A1=C3=A9 =C3=B4=C3=A1 =C3=A1=C3= =B1=C3=B7=C3=A5=C3=9F=C3=A1 =C3=B3=C3=B4=C3=AF=C3=AD =C3=AA=C3=9C=C3=A4=C3= =AF =C3=A1=C3=AD=C3=A1=C3=AA=C3=B5=C3=AA=C3=AB=C3=B9=C3=B3=C3=A7=C3=B2. =C3= =8D=C3=A1 =C3=AA=C3=A1=C3=B4=C3=A1=C3=B1=C3=A3=C3=AF=C3=BD=C3=AD=C3=B4=C3= =A1=C3=A9 =C3=B4=C3=A1 =C3=A1=C3=B1=C3=B7=C3=A5=C3=9F=C3=A1 =C3=AC=C3=BC=C3= =AB=C3=A9=C3=B2 =C3=A4=C3=A9=C3=A1=C3=A3=C3=B1=C3=9C=C3=B6=C3=AF=C3=AD=C3= =B4=C3=A1=C3=A9.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&=C3=85=C3=AC=C3=B6=C3=9C=C3=AD=C3=A9=C3=B3=C3=A7 =C3=B0=C3= =A1=C3=B1=C3=A1=C3=A8=C3=BD=C3=B1=C3=AF=C3=B5 =C3=A3=C3=A9=C3=A1 =C3=A5=C3= =B0=C3=A9=C3=A2=C3=A5=C3=A2=C3=A1=C3=9F=C3=B9=C3=B3=C3=A7 =C3=A4=C3=A9=C3= =A1=C3=A3=C3=B1=C3=A1=C3=B6=C3=BE=C3=AD", 14004, 20, 155, 155, 10, WS_TABST= OP + AUTOCHECKBOX "&=C3=85=C3=AC=C3=B6=C3=9C=C3=AD=C3=A9=C3=B3=C3=A7 =C3=B0=C3= =A1=C3=B1=C3=A1=C3=A8=C3=BD=C3=B1=C3=AF=C3=B5 =C3=A3=C3=A9=C3=A1 =C3=A5=C3= =B0=C3=A9=C3=A2=C3=A5=C3=A2=C3=A1=C3=9F=C3=B9=C3=B3=C3=A7 =C3=A4=C3=A9=C3= =A1=C3=A3=C3=B1=C3=A1=C3=B6=C3=BE=C3=AD", 14004, 20, 155, 155, 10, WS_TABST= OP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "=C3=8D=C3=9D=C3=AF=C3=B2 &=C3=96=C3=9C=C3=AA= =C3=A5=C3=AB=C3=AF=C3=B2" FCIDM_SHVIEW_NEWLINK "=C3=8D=C3=9D=C3=A1 &=C3=93=C3=B5=C3=AD=C3=B4= =C3=BC=C3=AC=C3=A5=C3=B5=C3=B3=C3=A7" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/en-GB.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/en-US.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/eo-EO.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/es-ES.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Tama=C3=B1o m=C3=A1ximo(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "&No mover archivos a la Papelera de reciclaje. Quitar los ar= chivos inmediatamente al eliminarlos.", 14003, 20, 117, 170, 20, BS_MULTILI= NE | WS_TABSTOP - RADIOBUTTON "&Mostrar cuadro de di=C3=A1logo para confirmar eliminaci=C3= =B3n", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&Mostrar cuadro de di=C3=A1logo para confirmar eliminaci=C3= =B3n", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -645,4 +645,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" FCIDM_SHVIEW_NEWLINK "Nuevo &acceso directo" IDS_FOLDER_OPTIONS "Opciones de carpetas" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/fi-FI.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Uusi &Kansio" FCIDM_SHVIEW_NEWLINK "Uusi &Linkki" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/fr-FR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Mar 16 09:55:04 2008 @@ -337,7 +337,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "T&aille maximale (MO) :", -1, 20, 105, 70, 10 RADIOBUTTON "Ne pas d=C3=A9placer les fichie&rs vers la Corbeille. Efface= r les fichiers imm=C3=A9diatement lors de la suppression.", 14003, 20, 117,= 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "Afficher une fen=C3=AAtre de confirmation d'effacement", 140= 04, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "Afficher une fen=C3=AAtre de confirmation d'effacement", 14= 004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -647,4 +647,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" FCIDM_SHVIEW_NEWLINK "Nouveau &lien" IDS_FOLDER_OPTIONS "Options du dossier" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/hu-HU.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Sun Mar 16 09:55:04 2008 @@ -336,7 +336,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -646,4 +646,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Mappa" FCIDM_SHVIEW_NEWLINK "&Parancsikon" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/it-IT.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "Dimensione &massima(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "&Non spostare i file nel cestino. I file verranno rimossi im= mediatamente.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Visualizzare un messaggio di richiesta di conferma della ca= ncellazione", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&Visualizzare un messaggio di richiesta di conferma della c= ancellazione", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,4 +644,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nuova &Cartella" FCIDM_SHVIEW_NEWLINK "Nuovo &Collegamento" IDS_FOLDER_OPTIONS "Opzioni della cartella" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ja-JP.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "=C2=83t=C2=83H=C2=83=C2=8B=C2=83_(&F)" FCIDM_SHVIEW_NEWLINK "=C2=83V=C2=83=C2=87=C2=81[=C2=83g=C2=83J=C2=83= b=C2=83g(&L)" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ko-KO.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/nb-NO.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Ny &mappe" FCIDM_SHVIEW_NEWLINK "Ny &snarvei" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/nl-NL.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/pl-PL.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Sun Mar 16 09:55:04 2008 @@ -339,7 +339,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Maksymalny rozmiar(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Nie przeno=C2=9C plik=C3=B3w do &Kosza, tylko od razu usuwaj= .", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Wy=C2=9Cwietl dialog z potwierdzeniem usuwania", 14004, 20,= 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&Wy=C2=9Cwietl dialog z potwierdzeniem usuwania", 14004, 20= , 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -649,4 +649,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Folder" FCIDM_SHVIEW_NEWLINK "&Skr=C3=B3t" IDS_FOLDER_OPTIONS "Opcje Katalog=C3=B3w" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/pt-BR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -645,4 +645,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/pt-PT.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -645,4 +645,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ru-RU.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 100, 78, 65, 14, WS_TABSTOP | ES_NUMBER LTEXT "&=C3=8C=C3=A0=C3=AA=C3=B1=C3=A8=C3=AC=C3=A0=C3=AB=C3=BC=C3=AD=C3= =BB=C3=A9 =C3=B0=C3=A0=C3=A7=C3=AC=C3=A5=C3=B0(=C3=8C=C3=A1):", -1, 17, 95,= 102, 10 RADIOBUTTON "&=C3=93=C3=AD=C3=A8=C3=B7=C3=B2=C3=AE=C3=A6=C3=A0=C3=B2=C3= =BC =C3=B4=C3=A0=C3=A9=C3=AB=C3=BB =C3=B1=C3=B0=C3=A0=C3=A7=C3=B3 =C3=AF=C3= =AE=C3=B1=C3=AB=C3=A5 =C3=B3=C3=A4=C3=A0=C3=AB=C3=A5=C3=AD=C3=A8=C3=BF, =C3= =AD=C3=A5 =C3=AF=C3=AE=C3=AC=C3=A5=C3=B9=C3=A0=C3=BF =C3=A8=C3=B5 =C3=A2 = =C3=AA=C3=AE=C3=B0=C3=A7=C3=A8=C3=AD=C3=B3.", 14003, 17, 108, 206, 20, BS_M= ULTILINE | WS_TABSTOP - RADIOBUTTON "&=C3=87=C3=A0=C3=AF=C3=B0=C3=A0=C3=B8=C3=A8=C3=A2=C3=A0=C3= =B2=C3=BC =C3=AF=C3=AE=C3=A4=C3=B2=C3=A2=C3=A5=C3=B0=C3=A6=C3=A4=C3=A5=C3= =AD=C3=A8=C3=A5 =C3=AD=C3=A0 =C3=B3=C3=A4=C3=A0=C3=AB=C3=A5=C3=AD=C3=A8=C3= =A5", 14004, 20, 145, 176, 10, WS_TABSTOP + AUTOCHECKBOX "&=C3=87=C3=A0=C3=AF=C3=B0=C3=A0=C3=B8=C3=A8=C3=A2=C3=A0=C3= =B2=C3=BC =C3=AF=C3=AE=C3=A4=C3=B2=C3=A2=C3=A5=C3=B0=C3=A6=C3=A4=C3=A5=C3= =AD=C3=A8=C3=A5 =C3=AD=C3=A0 =C3=B3=C3=A4=C3=A0=C3=AB=C3=A5=C3=AD=C3=A8=C3= =A5", 14004, 20, 145, 176, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -641,4 +641,7 @@ FCIDM_SHVIEW_NEWFOLDER "&=C3=8F=C3=A0=C3=AF=C3=AA=C3=A0" FCIDM_SHVIEW_NEWLINK "&=C3=9F=C3=B0=C3=AB=C3=BB=C3=AA" IDS_FOLDER_OPTIONS "=C3=91=C3=A2=C3=AE=C3=A9=C3=B1=C3=B2=C3=A2= =C3=A0 =C3=AF=C3=A0=C3=AF=C3=AA=C3=A8" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/sk-SK.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Sun Mar 16 09:55:04 2008 @@ -339,7 +339,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Maxim=C3=A1lna ve=C2=BEkos=C2=9D (MB):", -1, 20, 105, 70, 10 RADIOBUTTON "S=C3=BAbory nepremiest=C3=B2ova=C2=9D do &ko=C2=9Aa. Zmazan= =C3=A9 s=C3=BAbory hne=C3=AF odstr=C3=A1ni=C2=9D.", 14003, 20, 117, 170, 20= , BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "Zobrazova=C2=9D &dial=C3=B3gov=C3=A9 okno potvrdenia odstr= =C3=A1nenia", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "Zobrazova=C2=9D &dial=C3=B3gov=C3=A9 okno potvrdenia odstr= =C3=A1nenia", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -649,4 +649,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Prie=C3=A8inok" FCIDM_SHVIEW_NEWLINK "&Odkaz" IDS_FOLDER_OPTIONS "Mo=C2=9Enosti prie=C3=A8inka" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/sl-SI.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/sv-SE.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/tr-TR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Yeni &Dizin" FCIDM_SHVIEW_NEWLINK "Yeni &K=C3=BDsayol" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/uk-UA.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&=C3=83=C3=B0=C3=A0=C3=AD=C3=A8=C3=B7=C3=AD=C3=A8=C3=A9 =C3=AE=C3= =A1'=C2=BA=C3=AC =C3=AA=C3=AE=C3=B8=C3=A8=C3=AA=C3=A0 (=C3=8C=C3=A1):", -1,= 20, 105, 70, 10 RADIOBUTTON "=C3=8D=C3=A5 =C3=AF=C3=A5=C3=B0=C3=A5=C3=AC=C2=B3=C3=B9&=C3= =B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B4=C3=A0=C3=A9=C3=AB=C3=A8 =C3=A4=C3=AE =C3= =AA=C3=AE=C3=B8=C3=A8=C3=AA=C3=A0, =C3=A0 =C3=A2=C3=A8=C3=A4=C3=A0=C3=AB=C3= =BF=C3=B2=C3=A8 =C2=BF=C3=B5 =C3=AE=C3=B1=C3=B2=C3=A0=C3=B2=C3=AE=C3=B7=C3= =AD=C3=AE =C3=A2=C2=B3=C3=A4=C3=B0=C3=A0=C3=A7=C3=B3", 14003, 20, 117, 170,= 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "=C3=8F=C3=AE=C3=AA=C3=A0&=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=A4=C2=B3=C3=A0=C3=AB=C3=AE=C3=A3 =C3=AF=C2=B3=C3=A4=C3=B2=C3=A2=C3= =A5=C3=B0=C3=A4=C3=A6=C3=A5=C3=AD=C3=AD=C3=BF =C3=A2=C3=A8=C3=A4=C3=A0=C3= =AB=C3=A5=C3=AD=C3=AD=C3=BF", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "=C3=8F=C3=AE=C3=AA=C3=A0&=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=A4=C2=B3=C3=A0=C3=AB=C3=AE=C3=A3 =C3=AF=C2=B3=C3=A4=C3=B2=C3=A2=C3= =A5=C3=B0=C3=A4=C3=A6=C3=A5=C3=AD=C3=AD=C3=BF =C3=A2=C3=A8=C3=A4=C3=A0=C3= =AB=C3=A5=C3=AD=C3=AD=C3=BF", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,4 +644,7 @@ FCIDM_SHVIEW_NEWFOLDER "&=C3=8F=C3=A0=C3=AF=C3=AA=C3=B3" FCIDM_SHVIEW_NEWLINK "&=C3=9F=C3=B0=C3=AB=C3=A8=C3=AA" IDS_FOLDER_OPTIONS "=C3=82=C3=AB=C3=A0=C3=B1=C3=B2=C3=A8=C3=A2= =C3=AE=C3=B1=C3=B2=C2=B3 =C3=AF=C3=A0=C3=AF=C3=AA=C3=A8" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/wa-WA.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/zh-CN.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,6 +644,9 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + END = #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/zh-TW.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,6 +644,9 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + END = #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rec= yclebin.c?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Sun Mar 16 09:55:04 2008 @@ -793,30 +793,71 @@ RecycleBin_IContextMenu_GetCommandString }; = -INT_PTR -CALLBACK -RecycleBinGeneralDlg( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - - - return FALSE; -} +void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable) +{ + if (bEnable) + { + SendDlgItemMessage(hwndDlg, 14001, BM_SETCHECK, BST_UNCHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, 14002), FALSE); + SendDlgItemMessage(hwndDlg, 14003, BM_SETCHECK, BST_CHECKED, 0); + } + else + { + SendDlgItemMessage(hwndDlg, 14001, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, 14002), TRUE); + SendDlgItemMessage(hwndDlg, 14003, BM_SETCHECK, BST_UNCHECKED, 0); + } +} + = void -InitializeBitBucketDlg(HWND hwndDlg) +InitializeBitBucketDlg(HWND hwndDlg, WCHAR DefaultDrive) { WCHAR CurDrive =3D L'A'; WCHAR szDrive[] =3D L"A:\\"; DWORD dwDrives; - WCHAR szName[MAX_PATH+1]; + WCHAR szName[30]; + WCHAR szVolume[100]; DWORD MaxComponent, Flags; + LVCOLUMNW lc; + HWND hDlgCtrl; + LVITEMW li; + INT itemCount; + ULARGE_INTEGER TotalNumberOfFreeBytes, TotalNumberOfBytes, FreeBytesAva= ilable; + RECT rect; + int columnSize; + int defIndex =3D 0; + DWORD dwNukeOnDelete, dwSize; + + hDlgCtrl =3D GetDlgItem(hwndDlg, 14000); + + if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_LOCATION, szVolume, = sizeof(szVolume) / sizeof(WCHAR))) + szVolume[0] =3D 0; + + GetClientRect(hDlgCtrl, &rect); + + memset(&lc, 0, sizeof(LV_COLUMN) ); + lc.mask =3D LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT; + + columnSize =3D 140; //FIXME + lc.iSubItem =3D 0; + lc.fmt =3D LVCFMT_FIXED_WIDTH; + lc.cx =3D columnSize; + lc.cchTextMax =3D lstrlenW(szVolume); + lc.pszText =3D szVolume; + (void)ListView_InsertColumnW(hDlgCtrl, 0, &lc); + + if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_DISKSPACE, szVolume,= sizeof(szVolume) / sizeof(WCHAR))) + szVolume[0] =3D 0; + + lc.iSubItem =3D 1; + lc.cx =3D rect.right - rect.left - columnSize; + lc.cchTextMax =3D lstrlenW(szVolume); + lc.pszText =3D szVolume; + (void)ListView_InsertColumnW(hDlgCtrl, 1, &lc); = dwDrives =3D GetLogicalDrives(); + itemCount =3D 0; do { if ((dwDrives & 0x1)) @@ -824,10 +865,37 @@ UINT Type =3D GetDriveTypeW(szDrive); if (Type =3D=3D DRIVE_FIXED) //FIXME { - if (!GetVolumeInformationW(szDrive, szName, MAX_PATH+1, NULL, = &MaxComponent, &Flags, NULL, 0)) + if (!GetVolumeInformationW(szDrive, szName, sizeof(szName) / s= izeof(WCHAR), NULL, &MaxComponent, &Flags, NULL, 0)) { - wcscpy(szName, szDrive); + szName[0] =3D 0; } + sprintfW(szVolume, L"%s (%c)", szName, szDrive[0]); + memset(&li, 0x0, sizeof(LVITEMW)); + li.mask =3D LVIF_TEXT | LVIF_PARAM; + li.iSubItem =3D 0; + li.pszText =3D szVolume; + li.iItem =3D itemCount; + li.lParam =3D CurDrive; + (void)ListView_InsertItemW(hDlgCtrl, &li); + if (GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable , &TotalN= umberOfBytes, &TotalNumberOfFreeBytes)) + { + if (StrFormatByteSizeW(TotalNumberOfFreeBytes.QuadPart, sz= Volume, sizeof(szVolume) / sizeof(WCHAR))) + { + memset(&li, 0x0, sizeof(LVITEMW)); + li.mask =3D LVIF_TEXT; + li.iSubItem =3D 1; + li.pszText =3D szVolume; + li.iItem =3D itemCount; + (void)ListView_SetItemW(hDlgCtrl, &li); + } + } + + if (CurDrive =3D=3D DefaultDrive) + { + defIndex =3D itemCount; + } + + itemCount++; } } CurDrive++; @@ -835,10 +903,26 @@ dwDrives =3D (dwDrives >> 1); }while(dwDrives); = - -} - - + li.mask =3D LVIF_STATE; + li.state =3D LVIS_FOCUSED; + li.iItem =3D defIndex; + (void)ListView_SetItemW(hDlgCtrl, &li); + + wcscpy(szVolume, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explor= er\\Bitbucket\\c"); + szVolume[62] =3D DefaultDrive; + + dwSize =3D sizeof(dwNukeOnDelete); + if (RegGetValueW(HKEY_LOCAL_MACHINE, szVolume, L"NukeOnDelete", RRF_RT_= REG_DWORD, NULL, &dwNukeOnDelete, &dwSize) =3D=3D ERROR_SUCCESS) + { + toggleNukeOnDeleteOption(hwndDlg, dwNukeOnDelete); + } + else + { + /* default to NukeOnDelete = + */ + toggleNukeOnDeleteOption(hwndDlg, TRUE); + } +} = INT_PTR CALLBACK @@ -849,8 +933,29 @@ LPARAM lParam ) { - - + switch(uMsg) + { + case WM_INITDIALOG: + InitializeBitBucketDlg(hwndDlg, (WCHAR)lParam); + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case 14001: + toggleNukeOnDeleteOption(hwndDlg, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case 14003: + toggleNukeOnDeleteOption(hwndDlg, TRUE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case 14004: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } return FALSE; } = @@ -868,7 +973,7 @@ psh.hwndParent =3D NULL; psh.u3.phpage =3D hpsp; = - hprop =3D SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBuc= ketDlg, (LPARAM)0, NULL); + hprop =3D SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBuc= ketDlg, (LPARAM)sDrive, NULL); if (!hprop) { ERR("Failed to create property sheet"); @@ -888,7 +993,57 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - FIXME("(%s)\n", debugstr_w(wszPath)); + LONG res; + HKEY hKey; + DWORD RegSerial, dwNukeOnDelete, dwType; + LONG dwLength; + + + static WCHAR szKey[] =3D L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion= \\Explorer\\Bitbucket\\c"; + if (wszPath[1] !=3D L':') + { + /* path is UNC */ + return FALSE; + } + + szKey[62] =3D wszPath[0]; + res =3D RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &h= Key); + if (res !=3D ERROR_SUCCESS) + { + FIXME("Failed to open registry path"); + return FALSE; + } + dwLength =3D sizeof(RegSerial); + res =3D RegQueryValueExW(hKey, L"VolumeSerialNumber", NULL, &dwType, (L= PBYTE)&RegSerial, &dwLength); + if (res =3D=3D ERROR_SUCCESS) + { + DWORD FileSystemFlags, MaxComponentLength, VolSerialNumber; + = + GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxCompo= nentLength, &FileSystemFlags, NULL, 0); + if (VolSerialNumber !=3D RegSerial) + { + /* FIXME + * the current volume was mounted on a different path + */ + FIXME("mismatched serial volume number"); + RegCloseKey(hKey); + return FALSE; + } + } + = + dwLength =3D sizeof(dwNukeOnDelete); + res =3D RegQueryValueExW(hKey, L"NukeOnDelete", NULL, &dwType, (LPBYTE)= &dwNukeOnDelete, &dwLength); + if (res =3D=3D ERROR_SUCCESS && dwNukeOnDelete =3D=3D 0x0) + { + RegCloseKey(hKey); + return FALSE; + } + + /* FIXME + * check if trash is already full = + */ + + RegCloseKey(hKey); return TRUE; } = Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shr= esdef.h?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Sun Mar 16 09:55:04 2008 @@ -113,6 +113,8 @@ #define IDS_FOLDER_OPTIONS 150 #define IDS_COLUMN_EXTENSION 151 #define IDS_NO_EXTENSION 152 +#define IDS_RECYCLEBIN_LOCATION 153 +#define IDS_RECYCLEBIN_DISKSPACE 154 = /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

1 0

[fireball] 32698: - A complete diff of CC rewrite's MM to trunk's MM. Applies cleanly.
by fireball＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: fireball Date: Sun Mar 16 04:13:45 2008 New Revision: 32698 URL: http://svn.reactos.org/svn/reactos?rev=3D32698&view=3Drev Log: - A complete diff of CC rewrite's MM to trunk's MM. Applies cleanly. Added: branches/cache_manager_rewrite/mm.patch (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/cache_manager_rewrite/mm.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm.p= atch?rev=3D32698&view=3Dauto

1 0

[greatlrd] 32697: fix a old copy and paste comment text so it say right
by greatlrd＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: greatlrd Date: Sat Mar 15 19:22:29 2008 New Revision: 32697 URL: http://svn.reactos.org/svn/reactos?rev=3D32697&view=3Drev Log: fix a old copy and paste comment text so it say right Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntddraw/d3d.c?rev=3D32697&r1=3D32696&r2=3D32697&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sat Mar 15 19:22:29= 2008 @@ -76,8 +76,8 @@ * @name NtGdiD3dContextCreate * @implemented * -* The Function NtGdiDdCanCreateD3DBuffer checks if you can create a = -* surface for Directx. It redirects to dxg.sys in windows XP/2003, = +* The Function NtGdiD3dContextCreate checks if you can create a = +* context for Directx. It redirects to dxg.sys in windows XP/2003, = * dxkrnl.sys in vista and is fully implemented in win32k.sys in windows 20= 00 and below * * @param HANDLE hDirectDrawLocal

1 0

[greatlrd] 32696: update the docs for NtGdiD3dContextCreate some points I did not make clear how it works.
by greatlrd＠svn.reactos.org 16 Mar '08

16 Mar '08

Author: greatlrd Date: Sat Mar 15 19:16:42 2008 New Revision: 32696 URL: http://svn.reactos.org/svn/reactos?rev=3D32696&view=3Drev Log: update the docs for NtGdiD3dContextCreate some points I did not make clear how it works. = Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntddraw/d3d.c?rev=3D32696&r1=3D32695&r2=3D32696&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sat Mar 15 19:16:42= 2008 @@ -89,29 +89,35 @@ * @param HANDLE hSurfZ * Handle to a DD_SURFACE_LOCAL. It is the Z deep buffer. According MSDN if= it is set to NULL nothing should happen. * -* @param D3DNTHAL_CONTEXTCREATEDATA* hSurfZ +* @param LPD3DNTHAL_CONTEXTCREATEDATA pdcci * The buffer to create the context data * * @return = * DDHAL_DRIVER_HANDLED or DDHAL_DRIVER_NOTHANDLED if the driver supports t= his function. * A full check is done by checking if the return value is DDHAL_DRIVER_HAN= DLED = -* and puCanCreateSurfaceData->ddRVal is set to DD_OK. +* and pdcci->ddRVal is set to DD_OK. * * * @remarks. * dxg.sys NtGdiD3dContextCreate calls are redirected to the same function = in the dxg.sys. As such they all work the same way. * -* Before calling this function please set the hSurfZ->ddRVal to an error v= alue such as DDERR_NOTUSPORTED, +* Before calling this function please set the pdcci->ddRVal to an error va= lue such as DDERR_NOTSUPORTED, * for the ddRVal will otherwise be unchanged even if an error occurs insid= e the driver. = -* hSurfZ->dwhContext also needs to be filled in with the handle we got fro= m NtGdiDdCreateDirectDrawObject -* +* +* pdcci->lpDDLcl is a pointer to DDRAWI_DIRECTDRAW_LCL, not DD_DIRECTDRAW_= LOCAL as MSDN claims. +* pdcci->lpDDSLcl is a pointer to DDRAWI_DDRAWSURFACE_LCL, not DD_DDDRAWSU= RFACE_LOCAL as MSDN claims. +* pdcci->lpDDSZLcl is a pointer to DDRAWI_DDRAWSURFACE_LCL, not DD_DDRAWSU= RFACE_LOCAL as MSDN claims. +* pdcci->dwhContext also needs be filled in with the handle we receive fro= m NtGdiDdCreateDirectDrawObject. +* pdcci->dwPID the processid it belong to, that you need to fill in. +* Do not forget LPD3DNTHAL_CONTEXTCREATEDATA is typecast of LPD3DHAL_CONTE= XTCREATEDATA and thuse two struct are different size, +* the correct struct is LPD3DHAL_CONTEXTCREATEDATA. *--*/ BOOL = STDCALL NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, HANDLE hSurfColor, HANDLE hSurfZ, - D3DNTHAL_CONTEXTCREATEDATA* pdcci) + LPD3DNTHAL_CONTEXTCREATEDATA pdcci) { PGD_D3DCONTEXTCREATE pfnD3dContextCreate =3D (PGD_D3DCONTEXTCREATE)gpD= xFuncs[DXG_INDEX_DxD3dContextCreate].pfn; =

1 0

[greatlrd] 32695: update some comment that desc how some ntgdidd* works
by greatlrd＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: greatlrd Date: Sat Mar 15 16:00:58 2008 New Revision: 32695 URL: http://svn.reactos.org/svn/reactos?rev=3D32695&view=3Drev Log: update some comment that desc how some ntgdidd* works Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntddraw/d3d.c?rev=3D32695&r1=3D32694&r2=3D32695&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sat Mar 15 16:00:58= 2008 @@ -22,7 +22,8 @@ * @implemented * * The function NtGdiDdCanCreateD3DBuffer checks if you can create a = -* surface for DirectX. It is redirected to dxg.sys. +* surface for DirectX. it redirects to dxg.sys in windows XP/2003, = +* dxkrnl.sys in vista and is fully implemented in win32k.sys in windows 20= 00 and below * * @param HANDLE hDirectDraw * The handle we got from NtGdiDdCreateDirectDrawObject @@ -49,6 +50,8 @@ * puCanCreateSurfaceData->lpDD is a pointer to DDRAWI_DIRECTDRAW_GBL, not= PDD_DIRECTDRAW_GLOBAL as MSDN claims. * puCanCreateSurfaceData->lpDD->hDD also needs be filled in with the handl= e we got from NtGdiDdCreateDirectDrawObject. * puCreateSurfaceData->CanCreateSurface is a pointer to the real functions= in the HAL or HEL, that you need fill in. +* Do not forget PDD_CANCREATESURFACEDATA is typecast of LPDDHAL_CANCREATES= URFACEDATA and thuse two struct are different size, +* the correct struct is LPDDHAL_CANCREATESURFACEDATA. * *--*/ = @@ -74,7 +77,8 @@ * @implemented * * The Function NtGdiDdCanCreateD3DBuffer checks if you can create a = -* surface for Directx. It redirects the call to dxg.sys. +* surface for Directx. It redirects to dxg.sys in windows XP/2003, = +* dxkrnl.sys in vista and is fully implemented in win32k.sys in windows 20= 00 and below * * @param HANDLE hDirectDrawLocal * The handle we got from NtGdiDdCreateDirectDrawObject @@ -126,6 +130,8 @@ * @implemented * * The Function NtGdiD3dContextDestroy destorys the context data we got fro= m NtGdiD3dContextCreate +* It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is = fully implemented = +* in win32k.sys in windows 2000 and below * * @param LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData * The context data we want to destroy @@ -160,6 +166,8 @@ * * The Function NtGdiD3dContextDestroyAll destroys all the context data in = a process * The data having been allocated with NtGdiD3dContextCreate +* It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is = fully implemented = +* in win32k.sys in windows 2000 and below * * @param LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad * The context data we want to destory @@ -194,8 +202,9 @@ * @name NtGdiDdCreateD3DBuffer * @implemented * -* The function NtGdiDdCreateD3DBuffer creates a = -* surface for DirectX. It is redirected to dxg.sys. +* The function NtGdiDdCreateD3DBuffer creates a surface for DirectX. = +* It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is = fully implemented = +* in win32k.sys in windows 2000 and below * * @param HANDLE hDirectDraw * The handle we got from NtGdiDdCreateDirectDrawObject Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntddraw/ddraw.c?rev=3D32695&r1=3D32694&r2=3D32695&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sat Mar 15 16:00:= 58 2008 @@ -158,7 +158,7 @@ * @implemented * * The function NtGdiDxgGenericThunk redirects DirectX calls to another fun= ction. -* Redirection is done in dxg.sys in XP or higher. If dxg.sys does not exi= st, redirection takes place in win32k.sys +* It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is f= ully implemented in win32k.sys in windows 2000 and below * * @param ULONG_PTR ulIndex * The functions we want to redirect

1 0

[pschweitzer] 32694: - Fill in Identifier field when creating NTFS_xCB - Changed a memset call to RtlZeroMemory
by pschweitzer＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: pschweitzer Date: Sat Mar 15 04:47:00 2008 New Revision: 32694 URL: http://svn.reactos.org/svn/reactos?rev=3D32694&view=3Drev Log: - Fill in Identifier field when creating NTFS_xCB - Changed a memset call to RtlZeroMemory Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32694&r1=3D32693&r2=3D32694&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 15 04:47:00 2008 @@ -75,6 +75,9 @@ Fcb =3D ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_FCB), TAG_FCB); RtlZeroMemory(Fcb, sizeof(NTFS_FCB)); = + Fcb->Identifier.Type =3D NTFS_TYPE_FCB; + Fcb->Identifier.Size =3D sizeof(NTFS_TYPE_FCB); + if (FileName) { wcscpy(Fcb->PathName, FileName); @@ -230,6 +233,9 @@ return(STATUS_INSUFFICIENT_RESOURCES); } RtlZeroMemory(newCCB, sizeof(NTFS_CCB)); + + newCCB->Identifier.Type =3D NTFS_TYPE_CCB; + newCCB->Identifier.Size =3D sizeof(NTFS_TYPE_CCB); = FileObject->SectionObjectPointer =3D &Fcb->SectionObjectPointers; FileObject->FsContext =3D Fcb; @@ -396,7 +402,10 @@ { return(STATUS_INSUFFICIENT_RESOURCES); } - memset(newCCB, 0, sizeof(NTFS_CCB)); + RtlZeroMemory(newCCB, sizeof(NTFS_CCB)); + + newCCB->Identifier.Type =3D NTFS_TYPE_CCB; + newCCB->Identifier.Size =3D sizeof(NTFS_TYPE_CCB); = FileObject->SectionObjectPointer =3D &Fcb->SectionObjectPointers; FileObject->FsContext =3D Fcb; Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fsctl.c?rev=3D32694&r1=3D32693&r2=3D32694&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Mar 15 04:47:00 2008 @@ -304,12 +304,12 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PDEVICE_EXTENSION DeviceExt =3D NULL; PDEVICE_OBJECT NewDeviceObject =3D NULL; PDEVICE_OBJECT DeviceToMount; PIO_STACK_LOCATION Stack; PNTFS_FCB Fcb =3D NULL; PNTFS_CCB Ccb =3D NULL; + PNTFS_VCB Vcb =3D NULL; PVPB Vpb; NTSTATUS Status; = @@ -343,26 +343,28 @@ goto ByeBye; = NewDeviceObject->Flags =3D NewDeviceObject->Flags | DO_DIRECT_IO; - DeviceExt =3D (PVOID)NewDeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExt, - sizeof(DEVICE_EXTENSION)); + Vcb =3D (PVOID)NewDeviceObject->DeviceExtension; + RtlZeroMemory(Vcb, sizeof(NTFS_VCB)); + + Vcb->Identifier.Type =3D NTFS_TYPE_VCB; + Vcb->Identifier.Size =3D sizeof(NTFS_TYPE_VCB); = Status =3D NtfsGetVolumeData(DeviceToMount, - DeviceExt); + Vcb); if (!NT_SUCCESS(Status)) goto ByeBye; = NewDeviceObject->Vpb =3D DeviceToMount->Vpb; = - DeviceExt->StorageDevice =3D DeviceToMount; - DeviceExt->StorageDevice->Vpb->DeviceObject =3D NewDeviceObject; - DeviceExt->StorageDevice->Vpb->RealDevice =3D DeviceExt->StorageDevice; - DeviceExt->StorageDevice->Vpb->Flags |=3D VPB_MOUNTED; - NewDeviceObject->StackSize =3D DeviceExt->StorageDevice->StackSize + 1; + Vcb->StorageDevice =3D DeviceToMount; + Vcb->StorageDevice->Vpb->DeviceObject =3D NewDeviceObject; + Vcb->StorageDevice->Vpb->RealDevice =3D Vcb->StorageDevice; + Vcb->StorageDevice->Vpb->Flags |=3D VPB_MOUNTED; + NewDeviceObject->StackSize =3D Vcb->StorageDevice->StackSize + 1; NewDeviceObject->Flags &=3D ~DO_DEVICE_INITIALIZING; = - DeviceExt->StreamFileObject =3D IoCreateStreamFileObject(NULL, - DeviceExt->Storag= eDevice); + Vcb->StreamFileObject =3D IoCreateStreamFileObject(NULL, + Vcb->StorageDevice); = = Fcb =3D NtfsCreateFCB(NULL); @@ -380,47 +382,49 @@ Status =3D STATUS_INSUFFICIENT_RESOURCES; goto ByeBye; } - RtlZeroMemory(Ccb, - sizeof(NTFS_CCB)); - - DeviceExt->StreamFileObject->FsContext =3D Fcb; - DeviceExt->StreamFileObject->FsContext2 =3D Ccb; - DeviceExt->StreamFileObject->SectionObjectPointer =3D &Fcb->SectionObjec= tPointers; - DeviceExt->StreamFileObject->PrivateCacheMap =3D NULL; - DeviceExt->StreamFileObject->Vpb =3D DeviceExt->Vpb; - Ccb->PtrFileObject =3D DeviceExt->StreamFileObject; - Fcb->FileObject =3D DeviceExt->StreamFileObject; - Fcb->DevExt =3D (PDEVICE_EXTENSION)DeviceExt->StorageDevice; + RtlZeroMemory(Ccb, sizeof(NTFS_CCB)); + + Ccb->Identifier.Type =3D NTFS_TYPE_CCB; + Ccb->Identifier.Size =3D sizeof(NTFS_TYPE_CCB); + + Vcb->StreamFileObject->FsContext =3D Fcb; + Vcb->StreamFileObject->FsContext2 =3D Ccb; + Vcb->StreamFileObject->SectionObjectPointer =3D &Fcb->SectionObjectPoint= ers; + Vcb->StreamFileObject->PrivateCacheMap =3D NULL; + Vcb->StreamFileObject->Vpb =3D Vcb->Vpb; + Ccb->PtrFileObject =3D Vcb->StreamFileObject; + Fcb->FileObject =3D Vcb->StreamFileObject; + Fcb->DevExt =3D (PDEVICE_EXTENSION)Vcb->StorageDevice; = Fcb->Flags =3D FCB_IS_VOLUME_STREAM; = - Fcb->RFCB.FileSize.QuadPart =3D DeviceExt->NtfsInfo.SectorCount * Device= Ext->NtfsInfo.BytesPerSector; - Fcb->RFCB.ValidDataLength.QuadPart =3D DeviceExt->NtfsInfo.SectorCount *= DeviceExt->NtfsInfo.BytesPerSector; - Fcb->RFCB.AllocationSize.QuadPart =3D DeviceExt->NtfsInfo.SectorCount * = DeviceExt->NtfsInfo.BytesPerSector; /* Correct? */ + Fcb->RFCB.FileSize.QuadPart =3D Vcb->NtfsInfo.SectorCount * Vcb->NtfsInf= o.BytesPerSector; + Fcb->RFCB.ValidDataLength.QuadPart =3D Vcb->NtfsInfo.SectorCount * Vcb->= NtfsInfo.BytesPerSector; + Fcb->RFCB.AllocationSize.QuadPart =3D Vcb->NtfsInfo.SectorCount * Vcb->N= tfsInfo.BytesPerSector; /* Correct? */ = // Fcb->Entry.ExtentLocationL =3D 0; // Fcb->Entry.DataLengthL =3D DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSI= ZE; = - CcInitializeCacheMap(DeviceExt->StreamFileObject, + CcInitializeCacheMap(Vcb->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &(NtfsGlobalData->CacheMgrCallbacks), Fcb); = - ExInitializeResourceLite(&DeviceExt->DirResource); + ExInitializeResourceLite(&Vcb->DirResource); // ExInitializeResourceLite(&DeviceExt->FatResource); = - KeInitializeSpinLock(&DeviceExt->FcbListLock); - InitializeListHead(&DeviceExt->FcbListHead); + KeInitializeSpinLock(&Vcb->FcbListLock); + InitializeListHead(&Vcb->FcbListHead); = /* Get serial number */ - NewDeviceObject->Vpb->SerialNumber =3D DeviceExt->NtfsInfo.SerialNumber; + NewDeviceObject->Vpb->SerialNumber =3D Vcb->NtfsInfo.SerialNumber; = /* Get volume label */ - NewDeviceObject->Vpb->VolumeLabelLength =3D DeviceExt->NtfsInfo.VolumeLa= belLength; - RtlCopyMemory (NewDeviceObject->Vpb->VolumeLabel, - DeviceExt->NtfsInfo.VolumeLabel, - DeviceExt->NtfsInfo.VolumeLabelLength); + NewDeviceObject->Vpb->VolumeLabelLength =3D Vcb->NtfsInfo.VolumeLabelLen= gth; + RtlCopyMemory(NewDeviceObject->Vpb->VolumeLabel, + Vcb->NtfsInfo.VolumeLabel, + Vcb->NtfsInfo.VolumeLabelLength); = Status =3D STATUS_SUCCESS; = @@ -428,8 +432,8 @@ if (!NT_SUCCESS(Status)) { /* Cleanup */ - if (DeviceExt && DeviceExt->StreamFileObject) - ObDereferenceObject(DeviceExt->StreamFileObject); + if (Vcb && Vcb->StreamFileObject) + ObDereferenceObject(Vcb->StreamFileObject); if (Fcb) ExFreePool(Fcb); if (Ccb)

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