[ros-diffs] [pschweitzer] 44167: Finally fixed all pierre-fsd branch build. It now builds. Nothing says if it works...
pschweitzer at svn.reactos.org
pschweitzer at svn.reactos.org
Sat Nov 14 20:26:19 CET 2009
Author: pschweitzer
Date: Sat Nov 14 20:26:19 2009
New Revision: 44167
URL: http://svn.reactos.org/svn/reactos?rev=44167&view=rev
Log:
Finally fixed all pierre-fsd branch build.
It now builds. Nothing says if it works...
Modified:
branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild
branches/pierre-fsd/dll/win32/shell32/folder_options.c
branches/pierre-fsd/dll/win32/shell32/fprop.c
branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc
branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc
branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc
branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc
branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc
branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc
branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc
branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc
branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc
branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc
branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc
branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc
branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc
branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc
branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc
branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc
branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc
branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc
branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc
branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc
branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc
branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc
branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc
branches/pierre-fsd/dll/win32/shell32/shell32_main.h
branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c
branches/pierre-fsd/dll/win32/shell32/shresdef.h
branches/pierre-fsd/dll/win32/syssetup/wizard.c
branches/pierre-fsd/dll/win32/user32/windows/defwnd.c
branches/pierre-fsd/dll/win32/user32/windows/message.c
branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c
branches/pierre-fsd/include/ndk/rtlfuncs.h
Modified: branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -16,6 +16,7 @@
<library>secur32</library>
<library>iphlpapi</library>
<library>ws2_32</library>
+ <library>ntdll</library>
<library>pseh</library>
<file>cproxy.c</file>
<file>cpsf.c</file>
Modified: branches/pierre-fsd/dll/win32/shell32/folder_options.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/folder_options.c?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/folder_options.c [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/folder_options.c [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -22,6 +22,7 @@
WINE_DEFAULT_DEBUG_CHANNEL (fprop);
+#define MAX_PROPERTY_SHEET_PAGE (32)
/// Folder Options:
/// CLASSKEY = HKEY_CLASSES_ROOT\CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}
@@ -252,7 +253,12 @@
LPARAM lParam
)
{
-
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ InitializeFileTypesListCtrl(hwndDlg);
+ return TRUE;
+ }
return FALSE;
}
@@ -264,7 +270,7 @@
PROPSHEETHEADERW pinfo;
HPROPSHEETPAGE hppages[3];
HPROPSHEETPAGE hpage;
- UINT num_pages = 0;
+ UINT num_pages = 0;
WCHAR szOptions[100];
hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_GENERAL_DLG", FolderOptionsGeneralDlg, 0, NULL);
@@ -278,14 +284,14 @@
hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_FILETYPES_DLG", FolderOptionsFileTypesDlg, 0, NULL);
if (hpage)
hppages[num_pages++] = hpage;
-
+
szOptions[0] = L'\0';
- LoadStringW(hInst, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR));
- szOptions[99] = L'\0';
-
+ LoadStringW(shell32_hInstance, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR));
+ szOptions[(sizeof(szOptions)/sizeof(WCHAR))-1] = L'\0';
+
memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW));
pinfo.dwSize = sizeof(PROPSHEETHEADERW);
- pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE;
+ pinfo.dwFlags = PSH_NOCONTEXTHELP;
pinfo.nPages = num_pages;
pinfo.u3.phpage = hppages;
pinfo.pszCaption = szOptions;
@@ -334,7 +340,20 @@
Options_RunDLLCommon(hWnd, hInst, StrToIntW(cmd), nCmdShow);
}
-
+static
+DWORD WINAPI
+CountFolderAndFiles(LPVOID lParam)
+{
+ WIN32_FIND_DATAW FindData;
+ HANDLE hFile;
+ UINT Length;
+ LPWSTR pOffset;
+ BOOL ret;
+ PFOLDER_PROPERTIES_CONTEXT pContext = (PFOLDER_PROPERTIES_CONTEXT) lParam;
+
+ pOffset = PathAddBackslashW(pContext->szFolderPath);
+ if (!pOffset)
+ return 0;
Length = pOffset - pContext->szFolderPath;
Modified: branches/pierre-fsd/dll/win32/shell32/fprop.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/fprop.c?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/fprop.c [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/fprop.c [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -699,6 +699,7 @@
UINT Length;
DWORD dwName;
int Pages;
+ CLSID clsid;
pOffset = wcsrchr(wFileName, L'.');
@@ -804,10 +805,9 @@
wcscpy(wFileName, lpf);
}
- if (PathIsDirectoryW(wFileName) || strlenW(wFileName) == 3)
- {
- FIXME("directory / drive resources are missing\n");
- return FALSE;
+ if (PathIsDirectoryW(wFileName))
+ {
+ return SH_ShowFolderProperties(wFileName);
}
if (wcslen(wFileName) == 3)
Modified: branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -199,6 +199,27 @@
CHECKBOX "Spustit v oddìleném pamìovém prostoru", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Storno", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Obecné"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -721,6 +742,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -200,6 +200,28 @@
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abbrechen", 2, 120, 124, 50, 15, WS_VISIBLE
END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Allgemein"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Typ:", 14004, 8, 35, 50, 10
+ LTEXT "Dateiordner", 14005, 68, 35, 160, 10
+ LTEXT "Ort:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Größe:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Inhalt:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Erstellt:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Schreibgeschützt", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Versteckt", 14022, 126, 150, 50, 10
+END
+
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -723,6 +745,8 @@
IDS_PRINT_VERB "Drucken"
IDS_PLAY_VERB "Abspielen"
IDS_PREVIEW_VERB "Vorschau"
+
+ IDS_FILE_FOLDER "%u Dateien, %u Ordner"
IDS_PRINTERS "Drucker"
IDS_FONTS "Schriftarten"
IDS_INSTALLNEWFONT "Neue Schriftart installieren..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "ÅêôÝëåóç óå äéáöïñåôéêÞ ðåñéï÷Þ ìíÞìçò", 14001, 25, 100, 150, 10, WS_DISABLED
PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE
PUSHBUTTON "¢êõñï", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "ÃåíéêÜ"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130
@@ -721,6 +742,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -198,6 +198,28 @@
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
+END
+
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -720,6 +742,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -101,7 +101,7 @@
BEGIN
LTEXT "", IDD_TITLE, 10, 8, 198, 24
LTEXT "", IDD_STATUS, 10, 25, 198, 12
- LTEXT "Dossier:", IDD_FOLDER, 10, 152, 40, 12
+ LTEXT "Dossier :", IDD_FOLDER, 10, 152, 40, 12
CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Créer un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
@@ -171,19 +171,19 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE
- LTEXT "Type de la cible:", 14004, 8, 38, 64, 10
+ LTEXT "Type de la cible :", 14004, 8, 38, 64, 10
LTEXT "", 14005, 78, 38, 142, 10
- LTEXT "Localisation de la cible:", 14006, 8, 58, 64, 10
+ LTEXT "Localisation de la cible :", 14006, 8, 58, 64, 10
LTEXT "", 14007, 79, 58, 141, 10
- LTEXT "Cible:", 14008, 8, 77, 45, 10
+ LTEXT "Cible :", 14008, 8, 77, 45, 10
EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
- LTEXT "Démarrer dans:", 14010, 8, 96, 57, 10
+ LTEXT "Démarrer dans :", 14010, 8, 96, 57, 10
EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL
- LTEXT "Touche de raccourci:", 14014, 8, 115, 57, 10
+ LTEXT "Touche de raccourci :", 14014, 8, 115, 57, 10
EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT
- LTEXT "Exécuter:", 14016, 8, 134, 57, 10
+ LTEXT "Exécuter :", 14016, 8, 134, 57, 10
EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL
- LTEXT "C&ommentaire:", 14018, 8, 152, 57, 10
+ LTEXT "C&ommentaire :", 14018, 8, 152, 57, 10
EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL
PUSHBUTTON "Trouver la cible...", 14020, 9, 172, 70, 14, ES_LEFT
PUSHBUTTON "&Changer d'icône...", 14021, 84, 172, 70, 14, ES_LEFT
@@ -203,28 +203,49 @@
PUSHBUTTON "Annuler", 2, 120, 124, 50, 15, WS_VISIBLE
END
-SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Général"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
- LTEXT "Type de fichier:", 14004, 8, 35, 50, 10
+ LTEXT "Type de fichier :", 14004, 8, 35, 50, 10
+ LTEXT "Dossier", 14005, 68, 35, 160, 10
+ LTEXT "Localisation :", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Taille :", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contient :", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Créé :", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "Lectu&re-seule", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "Cac&hé", 14022, 126, 150, 50, 10
+END
+
+SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Général"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type de fichier :", 14004, 8, 35, 50, 10
LTEXT "Fichier", 14005, 68, 35, 160, 10
- LTEXT "Ouvrir avec:", 14006, 8, 53, 50, 10
+ LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10
LTEXT "", 14007, 68, 53, 160, 10
- LTEXT "Localisation:", 14008, 8, 72, 45, 10
+ LTEXT "Localisation :", 14008, 8, 72, 45, 10
LTEXT "", 14009, 68, 72, 315, 10
- LTEXT "Taille:", 14010, 8, 93, 45, 10
+ LTEXT "Taille :", 14010, 8, 93, 45, 10
LTEXT "", 14011, 68, 93, 160, 10
- LTEXT "Créé:", 14014, 8, 118, 45, 10
+ LTEXT "Créé :", 14014, 8, 118, 45, 10
LTEXT "", 14015, 68, 118, 160, 10
- LTEXT "Modifié:", 14016, 8, 140, 45, 10
+ LTEXT "Modifié :", 14016, 8, 140, 45, 10
LTEXT "", 14017, 68, 140, 160, 10
- LTEXT "Accédé:", 14018, 8, 160, 45, 10
+ LTEXT "Accédé :", 14018, 8, 160, 45, 10
LTEXT "", 14019, 68, 160, 160, 10
- LTEXT "Attributs:", 14020, 8, 189, 45, 10
+ LTEXT "Attributs :", 14020, 8, 189, 45, 10
CHECKBOX "Lectu&re-seule", 14021, 58, 189, 67, 10
CHECKBOX "Cac&hé", 14022, 126, 189, 50, 10
CHECKBOX "&Archive", 14023, 181, 189, 49, 10
@@ -235,15 +256,15 @@
CAPTION "Version"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "Version du fichier: ", 14000, 10, 10, 55, 10
+ LTEXT "Version du fichier : ", 14000, 10, 10, 55, 10
LTEXT "", 14001, 77, 10, 152, 10
- LTEXT "Description: ", 14002, 10, 27, 45, 10
+ LTEXT "Description : ", 14002, 10, 27, 45, 10
LTEXT "", 14003, 77, 27, 152, 10
- LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+ LTEXT "Copyright : ", 14004, 10, 46, 66, 10
LTEXT "", 14005, 77, 46, 152, 10
- GROUPBOX "Autres informations de version: ", 14006, 6, 70, 222, 115
- LTEXT "Nom de l'élément: ", 14007, 13, 82, 50, 10
- LTEXT "Valeur: ", 14008, 112, 82, 45, 10
+ GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115
+ LTEXT "Nom de l'élément : ", 14007, 13, 82, 50, 10
+ LTEXT "Valeur : ", 14008, 112, 82, 45, 10
LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
END
@@ -254,23 +275,23 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
EDITTEXT 14001, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
- LTEXT "Type:", -1, 15, 55, 40, 10
+ LTEXT "Type :", -1, 15, 55, 40, 10
LTEXT "", 14002, 110, 55, 100, 10
LTEXT "Système de fichiers :", -1, 15, 70, 100, 10
LTEXT "", 14003, 110, 70, 100, 10
CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
- LTEXT "Espace utilisé:", -1, 25, 90, 120, 10
+ LTEXT "Espace utilisé :", -1, 25, 90, 120, 10
LTEXT "", 14004, 110, 90, 120, 10
LTEXT "", 14005, 200, 90, 40, 10
CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
- LTEXT "Espace libre:", -1, 25, 105, 70, 10
+ LTEXT "Espace libre :", -1, 25, 105, 70, 10
LTEXT "", 14006, 110, 105, 120, 10
LTEXT "", 14007, 200, 105, 40, 10
- LTEXT "Capacité:", -1, 25, 125, 80, 10
+ LTEXT "Capacité :", -1, 25, 125, 80, 10
LTEXT "", 14008, 110, 125, 120, 10
LTEXT "", 14009, 200, 125, 40, 10
@@ -314,12 +335,12 @@
CHECKBOX "Utilisateur actuel %s", 14000, 10, 45, 150, 10
LTEXT "Protéger mon ordinateur et mes données des activités des programmes non autorisés", -1, 25, 57, 200, 10, WS_DISABLED
CHECKBOX "Cette option peut empêcher les virus d'ordinateur d'endommager votre ordinateur ou vos données personnelles, néanmoins sélectionner cette option pourrait empêcher le programme de fonctionner correctement.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
- CHECKBOX "L'utilisateur suivant:", 14002, 10, 100, 90, 10
- LTEXT "Nom d'utilisateur:", -1, 20, 118, 54, 10
+ CHECKBOX "L'utilisateur suivant :", 14002, 10, 100, 90, 10
+ LTEXT "Nom d'utilisateur :", -1, 20, 118, 54, 10
COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
- LTEXT "Mot de passe:", -1, 20, 143, 53, 10
+ LTEXT "Mot de passe :", -1, 20, 143, 53, 10
EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
@@ -629,14 +650,14 @@
IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier"
IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier"
IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier"
- IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?"
+ IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1' ?"
IDS_DELETEMULTIPLE_TEXT "Êtes-vous sûr de vouloir supprimer ces %1 éléments ?"
- IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer l(es) élement(s) sélectionné(s)?"
- IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir envoyer '%1' à la Corbeille?"
- IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir envoyer '%1' et tout ce qu'il contient à la Corbeille?"
- IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir envoyer ces %1 éléments à la Corbeille?"
- IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer?"
- IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer?"
+ IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer l(es) élement(s) sélectionné(s) ?"
+ IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir envoyer '%1' à la Corbeille ?"
+ IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir envoyer '%1' et tout ce qu'il contient à la Corbeille ?"
+ IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir envoyer ces %1 éléments à la Corbeille ?"
+ IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer ?"
+ IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer ?"
IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier"
IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\n"\
"Si les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le\n"\
@@ -645,9 +666,9 @@
/* message box strings */
IDS_RESTART_TITLE "Redémarrer"
- IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur?"
+ IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur ?"
IDS_SHUTDOWN_TITLE "Arrêter"
- IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS?"
+ IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?"
/* shell folder path default values */
IDS_PROGRAMS "Menu Démarrer\\Programmes"
Modified: branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -200,6 +200,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -723,6 +744,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -204,6 +204,27 @@
CHECKBOX "Uruchom w osobnym przedziale pamiêci", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Przerwij", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Ogólne"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Rozszerzenie:", 14004, 8, 35, 50, 10
+ LTEXT "Katalog", 14005, 68, 35, 160, 10
+ LTEXT "Lokalizacja:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Rozmiar:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Zawiera:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Utworzony:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Tylko-do-odczytu", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Ukryty", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
Modified: branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -199,6 +199,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -722,6 +743,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -199,6 +199,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -722,6 +743,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -205,6 +205,27 @@
PUSHBUTTON "Preruši", 2, 120, 124, 50, 15, WS_VISIBLE
END
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Všeobecné"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Typ:", 14004, 8, 35, 50, 10
+ LTEXT "Prieèinok", 14005, 68, 35, 160, 10
+ LTEXT "Umiestnenie:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Ve¾kos:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Obsahuje:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Vytvorený:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Iba na èítanie", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Skrytý", 14022, 126, 150, 50, 10
+END
+
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Všeobecné"
@@ -220,15 +241,15 @@
LTEXT "", 14009, 68, 72, 315, 10
LTEXT "Ve¾kos:", 14010, 8, 93, 45, 10
LTEXT "", 14011, 68, 93, 160, 10
- LTEXT "Vytvorené:", 14014, 8, 118, 45, 10
+ LTEXT "Vytvorený:", 14014, 8, 118, 45, 10
LTEXT "", 14015, 68, 118, 160, 10
- LTEXT "Zmenené:", 14016, 8, 140, 45, 10
+ LTEXT "Zmenený:", 14016, 8, 140, 45, 10
LTEXT "", 14017, 68, 140, 160, 10
- LTEXT "Otvorené:", 14018, 8, 160, 45, 10
+ LTEXT "Otvorený:", 14018, 8, 160, 45, 10
LTEXT "", 14019, 68, 160, 160, 10
LTEXT "Atribúty:", 14020, 8, 189, 45, 10
CHECKBOX "&Iba na èítanie", 14021, 58, 189, 67, 10
- CHECKBOX "S&krytý", 14022, 126, 189, 50, 10
+ CHECKBOX "&Skrytý", 14022, 126, 189, 50, 10
CHECKBOX "&Archívny", 14023, 181, 189, 49, 10
END
@@ -278,7 +299,7 @@
CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20
- LTEXT "Jednotka %s", 14010, 100, 170, 40, 10
+ LTEXT "Jednotka %s", 14010, 100, 170, 45, 10
PUSHBUTTON "&Èistenie disku", 14011, 180, 175, 50, 15, WS_TABSTOP
CHECKBOX "Ušetri miesto na disku &kompresiou jednotky", 14012, 10, 205, 180, 10, WS_DISABLED
CHECKBOX "&Povoli indexovanie pre tento disk, a zrýchli tak h¾adanie súborov", 14012, 10, 220, 225, 10, WS_DISABLED
@@ -339,7 +360,7 @@
EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
LTEXT "&Maximálna ve¾kos (MB):", -1, 20, 105, 70, 10
RADIOBUTTON "Súbory nepremiestòova do &koša. Zmazané súbory hneï odstráni.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
- AUTOCHECKBOX "Zobrazova &dialógové okno potvrdenia odstránenia", 14004, 20, 155, 140, 10, WS_TABSTOP
+ AUTOCHECKBOX "Zobrazova &dialógové okno potvrdenia odstránenia", 14004, 20, 155, 196, 10, WS_TABSTOP
END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
@@ -564,13 +585,13 @@
IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Change Icon"
+CAPTION "Zmena ikony"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- LTEXT "Filename:", -1, 7, 14, 208, 10
- PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+ LTEXT "Názov súboru:", -1, 7, 14, 208, 10
+ PUSHBUTTON "&Preh¾adáva...",IDC_BUTTON_PATH, 148, 24,67,14
EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
- LTEXT "Icons:", -1, 7, 47, 208, 10
+ LTEXT "Ikony:", -1, 7, 47, 208, 10
LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14
PUSHBUTTON "Zruši",IDCANCEL, 167, 181, 50, 14
@@ -692,9 +713,9 @@
IDS_SHELL_ABOUT_AUTHORS "&Autori"
IDS_SHELL_ABOUT_BACK "< &Spä"
- FCIDM_SHVIEW_NEW "&Nový"
+ FCIDM_SHVIEW_NEW "&Nový"
FCIDM_SHVIEW_NEWFOLDER "&Prieèinok"
- FCIDM_SHVIEW_NEWLINK "&Odkaz"
+ FCIDM_SHVIEW_NEWLINK "&Odkaz"
IDS_FOLDER_OPTIONS "Možnosti prieèinka"
IDS_RECYCLEBIN_LOCATION "Umiestnenia Koša" //Recycle Bin Location
IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto"
@@ -719,13 +740,15 @@
IDS_LNK_FILE "Odkaz"
IDS_SYS_FILE "Systémový súbor"
- IDS_OPEN_VERB "Open"
- IDS_RUNAS_VERB "Run as "
- IDS_EDIT_VERB "Edit"
- IDS_FIND_VERB "Find"
- IDS_PRINT_VERB "Print"
- IDS_PLAY_VERB "Play"
- IDS_PREVIEW_VERB "Preview"
+ IDS_OPEN_VERB "Otvori"
+ IDS_RUNAS_VERB "Spusti ako "
+ IDS_EDIT_VERB "Upravi"
+ IDS_FIND_VERB "Find" //Nájs, H¾ada, Vyh¾ada ???
+ IDS_PRINT_VERB "Tlaèi"
+ IDS_PLAY_VERB "Prehra"
+ IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukážka, Prezrie ???
+
+ IDS_FILE_FOLDER "súbory: %u, prieèinky: %u"
IDS_PRINTERS "Tlaèiarne"
IDS_FONTS "Písma"
IDS_INSTALLNEWFONT "&Nainštalova nové písmo..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -197,6 +197,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -720,6 +741,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -198,6 +198,27 @@
CHECKBOX "Çàïóñêàòè â îêðåì³é îáëàñò³ ïàì'ÿò³", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Ñêàñóâàòè", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Çàãàëüí³"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
Modified: branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -1,30 +1,18 @@
/*
- * Copyright 2002 Tisheng Chen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * (Simplified Chinese resources)
+ * (¼òÌåÖÐÎÄ×ÊÔ´)
+ * by zhangbing 2008 <e_zb at 21cn.com, ezb at mail.gywb.cn>
*/
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
+
MENU_001 MENU DISCARDABLE
BEGIN
- MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON
- MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON
- MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW
- MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW
+ MENUITEM "´óͼ±ê(&G)", FCIDM_SHVIEW_BIGICON
+ MENUITEM "Сͼ±ê(&M)", FCIDM_SHVIEW_SMALLICON
+ MENUITEM "Áбí(&L)", FCIDM_SHVIEW_LISTVIEW
+ MENUITEM "ÏêϸÐÅÏ¢(&D)", FCIDM_SHVIEW_REPORTVIEW
END
/* shellview background menu */
@@ -32,31 +20,31 @@
BEGIN
POPUP ""
BEGIN
- POPUP "&View"
+ POPUP "²é¿´(&V)"
BEGIN
- MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON
- MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON
- MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW
- MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW
+ MENUITEM "´óͼ±ê(&G)", FCIDM_SHVIEW_BIGICON
+ MENUITEM "Сͼ±ê(&M)", FCIDM_SHVIEW_SMALLICON
+ MENUITEM "Áбí(&L)", FCIDM_SHVIEW_LISTVIEW
+ MENUITEM "ÏêϸÐÅÏ¢(&D)", FCIDM_SHVIEW_REPORTVIEW
END
MENUITEM SEPARATOR
- POPUP "Arrange &Icons"
+ POPUP "ÅÅÁÐͼ±ê(&I)"
BEGIN
- MENUITEM "By &Name", 0x30 /* column 0 */
- MENUITEM "By &Type", 0x32 /* column 2 */
- MENUITEM "By &Size", 0x31 /* ... */
- MENUITEM "By &Date", 0x33
+ MENUITEM "Ãû³Æ(&N)", 0x30 /* column 0 */
+ MENUITEM "ÀàÐÍ(&T)", 0x32 /* column 2 */
+ MENUITEM "´óС(&S)", 0x31 /* ... */
+ MENUITEM "ÐÞ¸Äʱ¼ä(&D)", 0x33
MENUITEM SEPARATOR
- MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "×Ô¶¯ÅÅÁÐ(&D)", FCIDM_SHVIEW_AUTOARRANGE
END
- MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID
+ MENUITEM "ÅÅÁÐͼ±ê", FCIDM_SHVIEW_SNAPTOGRID
MENUITEM SEPARATOR
- MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
+ MENUITEM "Ë¢ÐÂ", FCIDM_SHVIEW_REFRESH
MENUITEM SEPARATOR
- MENUITEM "Paste", FCIDM_SHVIEW_INSERT
- MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK
+ MENUITEM "Õ³Ìù", FCIDM_SHVIEW_INSERT
+ MENUITEM "Õ³Ìù¿ì½Ý·½Ê½", FCIDM_SHVIEW_INSERTLINK
MENUITEM SEPARATOR
- MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES
+ MENUITEM "ÊôÐÔ", FCIDM_SHVIEW_PROPERTIES
END
END
@@ -66,16 +54,16 @@
POPUP ""
BEGIN
MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE
- MENUITEM "&Open", FCIDM_SHVIEW_OPEN
+ MENUITEM "´ò¿ª(&O)", FCIDM_SHVIEW_OPEN
MENUITEM SEPARATOR
- MENUITEM "C&ut", FCIDM_SHVIEW_CUT
- MENUITEM "&Copy", FCIDM_SHVIEW_COPY
+ MENUITEM "¼ôÇÐ(&U)", FCIDM_SHVIEW_CUT
+ MENUITEM "¸´ÖÆ(&C)", FCIDM_SHVIEW_COPY
MENUITEM SEPARATOR
- MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK
- MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
- MENUITEM "&Rename", FCIDM_SHVIEW_RENAME
+ MENUITEM "´´½¨¿ì½Ý·½Ê½(&L)", FCIDM_SHVIEW_CREATELINK
+ MENUITEM "ɾ³ý(&D)", FCIDM_SHVIEW_DELETE
+ MENUITEM "ÖØÃüÃû(&R)", FCIDM_SHVIEW_RENAME
MENUITEM SEPARATOR
- MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES
+ MENUITEM "ÊôÐÔ(&P)", FCIDM_SHVIEW_PROPERTIES
END
END
@@ -84,8 +72,8 @@
CAPTION "Browse for Folder"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "È·¶¨", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "È¡Ïû", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
LTEXT "", IDD_TITLE, 4, 4, 180, 12
LTEXT "", IDD_STATUS, 4, 25, 180, 12
CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
@@ -102,8 +90,8 @@
CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
- DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "È·¶¨", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
END
SHELL_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90
@@ -196,8 +184,29 @@
CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10
LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
- PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
+ PUSHBUTTON "È·¶¨", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -319,8 +328,8 @@
LTEXT "Password:", -1, 20, 143, 53, 10
EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
- PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
- PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+ PUSHBUTTON "È·¶¨", 14007, 57, 170, 60, 14, WS_TABSTOP
+ PUSHBUTTON "È¡Ïû", 14008, 122, 170, 60, 14, WS_TABSTOP
END
BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190
@@ -349,8 +358,8 @@
LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE
AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
- PUSHBUTTON "OK", 14005, 150, 236, 50, 14
- PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14
+ PUSHBUTTON "È·¶¨", 14005, 150, 236, 50, 14
+ PUSHBUTTON "È¡Ïû", 14006, 206, 236, 50, 14
END
FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256
@@ -416,7 +425,7 @@
DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14
PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14
PUSHBUTTON "&No", IDNO, 150, 122, 60, 14
- PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 215, 122, 60, 14
ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
@@ -437,7 +446,7 @@
ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22
DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14
- PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 122, 40, 60, 14
END
DISCONNECT_DLG DIALOGEX 0, 0, 190, 60
@@ -448,7 +457,7 @@
ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL
LTEXT "Are you sure you want to disconnect?", -1, 49, 12, 137, 23
DEFPUSHBUTTON "&Disconnect", IDOK, 57, 40, 60, 14
- PUSHBUTTON "Cancel", IDCANCEL, 123, 40, 60, 14
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 123, 40, 60, 14
END
AUTOPLAY1_DLG DIALOGEX 0, 0, 227, 218
@@ -474,8 +483,8 @@
LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20
LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8
CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
- DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
- PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14
+ DEFPUSHBUTTON "È·¶¨", IDOK, 96, 186, 60, 14
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 160, 186, 60, 14
END
MIXED_CONTENT2_DLG DIALOGEX 0, 0, 227, 206
@@ -490,8 +499,8 @@
LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8
CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10
- DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
- PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14
+ DEFPUSHBUTTON "È·¶¨", IDOK, 96, 185, 60, 14
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 160, 185, 60, 14
END
AUTOPLAY2_DLG DIALOGEX 0, 0, 227, 181
@@ -504,8 +513,8 @@
LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8
CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8
- DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
- PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14
+ DEFPUSHBUTTON "È·¶¨", IDOK, 94, 160, 60, 14
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 159, 160, 60, 14
END
SHUTDOWN_DLG DIALOGEX 0, 0, 211, 103
@@ -517,30 +526,30 @@
LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10
COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37
- DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
- PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14
+ DEFPUSHBUTTON "È·¶¨", 1, 7, 82, 60, 14, WS_GROUP
+ PUSHBUTTON "È¡Ïû", IDCANCEL, 75, 82, 60, 14
PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14
END
FORMAT_DLG DIALOGEX 50, 50, 184, 218
STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Format"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14
- PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14
- LTEXT "Ca&pacity:", -1, 7, 6, 169, 9
+CAPTION "¸ñʽ»¯"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "¿ªÊ¼(&S)", IDOK, 53, 198, 60, 14
+ PUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL, 118, 198, 60, 14
+ LTEXT "ÈÝÁ¿(&P):", -1, 7, 6, 169, 9
COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
- LTEXT "&File system", -1, 7, 35, 170, 9
+ LTEXT "Îļþϵͳ(&F)", -1, 7, 35, 170, 9
COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8
- LTEXT "&Allocation unit size", -1, 7, 64, 170, 9
+ LTEXT "·ÖÅäµ¥Ôª´óС(&A)", -1, 7, 64, 170, 9
COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
- LTEXT "Volume &label", -1, 7, 93, 170, 9
+ LTEXT "¾í±ê(&L)", -1, 7, 93, 170, 9
EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
- GROUPBOX "Format &options", 4610, 7, 121, 170, 49
- AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10
- AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
+ GROUPBOX "¸ñʽ»¯Ñ¡Ïî(&O)", 4610, 7, 121, 170, 49
+ AUTOCHECKBOX "¿ìËÙ¸ñʽ»¯(&Q)", 28674, 16, 135, 155, 10
+ AUTOCHECKBOX "ÆôÓÃѹËõ(&E)", 28675, 16, 152, 155, 10
END
CHKDSK_DLG DIALOGEX 50, 50, 194, 120
@@ -559,16 +568,16 @@
IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Change Icon"
+CAPTION "¸ü¸Äͼ±ê"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- LTEXT "Filename:", -1, 7, 14, 208, 10
- PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+ LTEXT "ÎļþÃû:", -1, 7, 14, 208, 10
+ PUSHBUTTON "ä¯ÀÀ...",IDC_BUTTON_PATH, 148, 24,67,14
EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
LTEXT "Icons:", -1, 7, 47, 208, 10
LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
- DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14
- PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14
+ DEFPUSHBUTTON "È·¶¨",IDOK, 107, 181,50, 14
+ PUSHBUTTON "È¡Ïû",IDCANCEL, 167, 181, 50, 14
END
STRINGTABLE DISCARDABLE
@@ -599,17 +608,17 @@
IDS_SHV_COLUMN_MODEL "Model"
/* special folders */
- IDS_DESKTOP "Desktop"
- IDS_MYCOMPUTER "My Computer"
- IDS_RECYCLEBIN_FOLDER_NAME "Trash"
- IDS_CONTROLPANEL "Control Panel"
+ IDS_DESKTOP "×ÀÃæ"
+ IDS_MYCOMPUTER "ÎҵĵçÄÔ"
+ IDS_RECYCLEBIN_FOLDER_NAME "»ØÊÕÕ¾"
+ IDS_CONTROLPANEL "¿ØÖÆÃæ°å"
IDS_ADMINISTRATIVETOOLS "Administrative Tools"
/* context menus */
- IDS_VIEW_LARGE "Lar&ge Icons"
- IDS_VIEW_SMALL "S&mall Icons"
- IDS_VIEW_LIST "&List"
- IDS_VIEW_DETAILS "&Details"
+ IDS_VIEW_LARGE "´óͼ±ê(&G)"
+ IDS_VIEW_SMALL "Сͼ±ê(&M)"
+ IDS_VIEW_LIST "Áбí(&L)"
+ IDS_VIEW_DETAILS "ÏêϸÐÅÏ¢(&D)"
IDS_SELECT "Select"
IDS_OPEN "Open"
IDS_CREATELINK "´´½¨¿ì½Ý·½Ê½(&L)"
@@ -641,14 +650,14 @@
"the folder?"
/* message box strings */
- IDS_RESTART_TITLE "Restart"
- IDS_RESTART_PROMPT "Do you want to restart the system?"
- IDS_SHUTDOWN_TITLE "Shutdown"
- IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
+ IDS_RESTART_TITLE "ÖØÐÂÆô¶¯"
+ IDS_RESTART_PROMPT "ÊÇ·ñÖØÐÂÆô¶¯ÏµÍ³?"
+ IDS_SHUTDOWN_TITLE "¹Ø»ú"
+ IDS_SHUTDOWN_PROMPT "ÊÇ·ñ¹Ø±Õϵͳ?"
/* shell folder path default values */
IDS_PROGRAMS "Start Menu\\Programs"
- IDS_PERSONAL "My Documents"
+ IDS_PERSONAL "ÎÒµÄÎĵµ"
IDS_FAVORITES "Favorites"
IDS_STARTUP "Start Menu\\Programs\\StartUp"
IDS_RECENT "Recent"
@@ -674,7 +683,7 @@
IDS_COMMON_PICTURES "Documents\\My Pictures"
IDS_COMMON_VIDEO "Documents\\My Videos"
IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning"
- IDS_NETWORKPLACE "My Network Places"
+ IDS_NETWORKPLACE "ÍøÉÏÁÚ¾Ó"
IDS_NEWFOLDER "New Folder"
@@ -682,18 +691,17 @@
IDS_DRIVE_CDROM "CDROM"
IDS_DRIVE_NETWORK "Network Disk"
- IDS_OPEN_WITH "Open With"
- IDS_OPEN_WITH_CHOOSE "Select Program"
+ IDS_OPEN_WITH "´ò¿ª·½Ê½"
+ IDS_OPEN_WITH_CHOOSE "Ñ¡Ôñ³ÌÐò"
IDS_SHELL_ABOUT_AUTHORS "&Authors"
IDS_SHELL_ABOUT_BACK "< &Back"
- FCIDM_SHVIEW_NEW "New"
- FCIDM_SHVIEW_NEWFOLDER "New &Folder"
- FCIDM_SHVIEW_NEWLINK "New &Link"
+ FCIDM_SHVIEW_NEW "н¨"
+ FCIDM_SHVIEW_NEWFOLDER "Îļþ¼Ð(&F)"
+ FCIDM_SHVIEW_NEWLINK "¿ì½Ý·½Ê½(&L)"
IDS_FOLDER_OPTIONS "Folder Options"
IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
IDS_RECYCLEBIN_DISKSPACE "Space Available"
- IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
IDS_PICK_ICON_TITLE "Choose Icon"
IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0"
@@ -721,6 +729,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
@@ -728,4 +738,3 @@
IDS_DEFAULT_CLUSTER_SIZE "Default allocation size"
END
-#pragma code_page(default)
Modified: branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -198,6 +198,27 @@
CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED
PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+END
+
+SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE
+ EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY
+ LTEXT "Type of file:", 14004, 8, 35, 50, 10
+ LTEXT "Folder", 14005, 68, 35, 160, 10
+ LTEXT "Location:", 14006, 8, 53, 50, 10
+ LTEXT "", 14007, 68, 53, 315, 10
+ LTEXT "Size:", 14008, 8, 72, 45, 10
+ LTEXT "", 14009, 68, 72, 315, 10
+ LTEXT "Contains:", 14010, 8, 93, 45, 10
+ LTEXT "", 14011, 68, 93, 160, 10
+ LTEXT "Created:", 14014, 8, 118, 45, 10
+ LTEXT "", 14015, 68, 118, 160, 10
+ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
END
SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205
@@ -721,6 +742,8 @@
IDS_PRINT_VERB "Print"
IDS_PLAY_VERB "Play"
IDS_PREVIEW_VERB "Preview"
+
+ IDS_FILE_FOLDER "%u Files, %u Folders"
IDS_PRINTERS "Printers"
IDS_FONTS "Fonts"
IDS_INSTALLNEWFONT "Install New Font..."
Modified: branches/pierre-fsd/dll/win32/shell32/shell32_main.h
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/shell32_main.h?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/shell32_main.h [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/shell32_main.h [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -238,4 +238,5 @@
BOOL SH_ShowDriveProperties(WCHAR * drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl);
BOOL SH_ShowRecycleBinProperties(WCHAR sDrive);
BOOL SH_ShowPropertiesDialog(LPWSTR lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl);
+BOOL SH_ShowFolderProperties(LPWSTR pwszFolder);
#endif
Modified: branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -653,18 +653,20 @@
}
else if (_ILIsDrive(pidl))
{
+
_ILSimpleGetTextW (pidl, pszPath, MAX_PATH); /* append my own path */
-
/* long view "lw_name (C:)" */
if (!(dwFlags & SHGDN_FORPARSING))
{
- DWORD dwVolumeSerialNumber, dwMaximumComponetLength, dwFileSystemFlags;
WCHAR wszDrive[18] = {0};
+ DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags;
static const WCHAR wszOpenBracket[] = {' ','(',0};
static const WCHAR wszCloseBracket[] = {')',0};
- GetVolumeInformationW (pszPath, wszDrive,
- sizeof(wszDrive)/sizeof(wszDrive[0]) - 6,
+ lstrcpynW(wszDrive, pszPath, 4);
+ pszPath[0] = L'\0';
+ GetVolumeInformationW (wszDrive, pszPath,
+ MAX_PATH - 7,
&dwVolumeSerialNumber,
&dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0);
pszPath[MAX_PATH-1] = L'\0';
Modified: branches/pierre-fsd/dll/win32/shell32/shresdef.h
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/shresdef.h?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/shell32/shresdef.h [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -142,7 +142,7 @@
#define IDS_PRINT_VERB 304
#define IDS_PLAY_VERB 305
#define IDS_PREVIEW_VERB 306
-
+#define IDS_FILE_FOLDER 307
#define IDS_CREATELINK 308
#define IDS_INSTALLNEWFONT 309
#define IDS_SHV_COLUMN_FONTTYPE 310
Modified: branches/pierre-fsd/dll/win32/syssetup/wizard.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/syssetup/wizard.c?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/syssetup/wizard.c [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -1812,6 +1812,7 @@
{
PSETUPDATA SetupData;
PREGISTRATIONNOTIFY RegistrationNotify;
+ static UINT oldActivityID = -1;
WCHAR Title[64];
/* Retrieve pointer to the global setup data */
@@ -1863,7 +1864,10 @@
{
WCHAR Activity[64];
RegistrationNotify = (PREGISTRATIONNOTIFY) lParam;
- if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID,
+ // update if necessary only
+ if (oldActivityID != RegistrationNotify->ActivityID)
+ {
+ if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID,
Activity,
sizeof(Activity) / sizeof(Activity[0])))
{
Modified: branches/pierre-fsd/dll/win32/user32/windows/defwnd.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/user32/windows/defwnd.c?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -682,6 +682,13 @@
DeleteObject(DesktopRgn);
}
}
+#if 0
+ if (ISITHOOKED(WH_CBT))
+ {
+ if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, (LPARAM)&sizingRect, 0, FNID_DEFWINDOWPROC, FALSE))
+ moved = FALSE;
+ }
+#endif
(void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL);
SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 );
SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L);
@@ -761,6 +768,13 @@
WINDOWPLACEMENT wp;
POINT Pt;
+#if 0
+ if (ISITHOOKED(WH_CBT))
+ {
+ if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE))
+ return 0;
+ }
+#endif
switch (wParam & 0xfff0)
{
case SC_MOVE:
@@ -1451,7 +1465,8 @@
case WM_SHOWWINDOW:
{
- NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE);
+ if (lParam) // Call when it is necessary.
+ NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE);
break;
}
Modified: branches/pierre-fsd/dll/win32/user32/windows/message.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/user32/windows/message.c?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/user32/windows/message.c [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/user32/windows/message.c [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -1472,6 +1472,11 @@
MsgiKMToUMCleanup(&Info.Msg, &Conversion.UnicodeMsg);
return (BOOL) -1;
}
+ if (!lpMsg)
+ {
+ SetLastError( ERROR_NOACCESS );
+ return FALSE;
+ }
*lpMsg = Conversion.AnsiMsg;
Conversion.Ansi = TRUE;
Conversion.FinalMsg = lpMsg;
@@ -1512,6 +1517,11 @@
{
return (BOOL) -1;
}
+ if (!lpMsg)
+ {
+ SetLastError( ERROR_NOACCESS );
+ return FALSE;
+ }
*lpMsg = Conversion.UnicodeMsg;
Conversion.Ansi = FALSE;
Conversion.FinalMsg = lpMsg;
@@ -1558,6 +1568,11 @@
MsgiKMToUMCleanup(&Info.Msg, &Conversion.UnicodeMsg);
return (BOOL) -1;
}
+ if (!lpMsg)
+ {
+ SetLastError( ERROR_NOACCESS );
+ return FALSE;
+ }
*lpMsg = Conversion.AnsiMsg;
Conversion.Ansi = TRUE;
Conversion.FinalMsg = lpMsg;
@@ -1601,6 +1616,11 @@
{
return (BOOL) -1;
}
+ if (!lpMsg)
+ {
+ SetLastError( ERROR_NOACCESS );
+ return FALSE;
+ }
*lpMsg = Conversion.UnicodeMsg;
Conversion.Ansi = FALSE;
Conversion.FinalMsg = lpMsg;
@@ -1882,7 +1902,7 @@
wParam,
lParam,
(ULONG_PTR)&lpCallBack,
- NUMC_SENDMESSAGECALLBACK,
+ FNID_SENDMESSAGECALLBACK,
TRUE);
}
@@ -1904,7 +1924,7 @@
wParam,
lParam,
(ULONG_PTR)&lpCallBack,
- NUMC_SENDMESSAGECALLBACK,
+ FNID_SENDMESSAGECALLBACK,
FALSE);
}
@@ -2571,15 +2591,6 @@
return IsDialogMessageW( hwndDlg, &msg );
}
-typedef struct _BROADCASTPARM
-{
- DWORD flags;
- DWORD recipients;
- HDESK hDesk;
- HWND hWnd;
- LUID luid;
-} BROADCASTPARM, *PBROADCASTPARM;
-
LONG
WINAPI
IntBroadcastSystemMessage(
@@ -2647,7 +2658,7 @@
wParam,
lParam,
(ULONG_PTR)&parm,
- NUMC_BROADCASTSYSTEMMESSAGE,
+ FNID_BROADCASTSYSTEMMESSAGE,
Ansi);
}
Modified: branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -313,7 +313,8 @@
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -346,7 +347,8 @@
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -402,7 +404,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -417,7 +420,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -476,6 +480,7 @@
{
UNIMPLEMENTED
+ WSASetLastError(WSASYSCALLFAILURE);
return FALSE;
}
@@ -491,7 +496,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -506,7 +512,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -539,6 +546,7 @@
{
UNIMPLEMENTED
+ WSASetLastError(WSASYSCALLFAILURE);
return INVALID_SOCKET;
}
@@ -554,7 +562,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -569,7 +578,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -610,7 +620,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -623,7 +634,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
/* WinSock Service Provider support functions */
@@ -641,7 +653,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -658,7 +671,7 @@
{
UNIMPLEMENTED
- return 0;
+ return WSASYSCALLFAILURE;
}
@@ -672,7 +685,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -688,7 +702,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -704,7 +719,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -721,7 +737,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -735,7 +752,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -752,7 +770,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -765,7 +784,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -779,7 +799,7 @@
{
UNIMPLEMENTED
- return 0;
+ return WSASYSCALLFAILURE;
}
/*
@@ -796,9 +816,10 @@
LPDWORD lpcbBytesReturned,
LPWSACOMPLETION lpCompletion)
{
- //UNIMPLEMENTED
-
- return 0;
+ UNIMPLEMENTED
+
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
@@ -815,7 +836,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
/*
@@ -828,32 +850,7 @@
{
UNIMPLEMENTED
- return 0;
-}
-
-/*
- * @unimplemented
- */
-VOID
-EXPORT
-freeaddrinfo(struct addrinfo *pAddrInfo)
-{
- UNIMPLEMENTED
-}
-
-/*
- * @unimplemented
- */
-INT
-EXPORT
-getaddrinfo(const char FAR * nodename,
- const char FAR * servname,
- const struct addrinfo FAR * hints,
- struct addrinfo FAR * FAR * res)
-{
- UNIMPLEMENTED
-
- return EAI_NONAME;
+ return WSASYSCALLFAILURE;
}
/*
@@ -871,7 +868,8 @@
{
UNIMPLEMENTED
- return 0;
+ WSASetLastError(WSASYSCALLFAILURE);
+ return SOCKET_ERROR;
}
/*
@@ -889,7 +887,7 @@
{
UNIMPLEMENTED
- return 0;
+ return FALSE;
}
/* EOF */
Modified: branches/pierre-fsd/include/ndk/rtlfuncs.h
URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ndk/rtlfuncs.h?rev=44167&r1=44166&r2=44167&view=diff
==============================================================================
--- branches/pierre-fsd/include/ndk/rtlfuncs.h [iso-8859-1] (original)
+++ branches/pierre-fsd/include/ndk/rtlfuncs.h [iso-8859-1] Sat Nov 14 20:26:19 2009
@@ -2681,6 +2681,7 @@
// Generic Table Functions
//
#if defined(NTOS_MODE_USER) || defined(_NTIFS_)
+NTSYSAPI
PVOID
NTAPI
RtlInsertElementGenericTable(
@@ -2690,6 +2691,7 @@
OUT PBOOLEAN NewElement OPTIONAL
);
+NTSYSAPI
PVOID
NTAPI
RtlInsertElementGenericTableFull(
@@ -2701,12 +2703,14 @@
IN TABLE_SEARCH_RESULT SearchResult
);
+NTSYSAPI
BOOLEAN
NTAPI
RtlIsGenericTableEmpty(
IN PRTL_GENERIC_TABLE Table
);
+NTSYSAPI
PVOID
NTAPI
RtlLookupElementGenericTableFull(
More information about the Ros-diffs
mailing list