Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 51136: Forgotten in r51135...
by rharabien＠svn.reactos.org 25 Mar '11

25 Mar '11

Author: rharabien Date: Fri Mar 25 21:49:03 2011 New Revision: 51136 URL: http://svn.reactos.org/svn/reactos?rev=51136&view=rev Log: Forgotten in r51135... Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Fri Mar 25 21:49:03 2011 @@ -36,6 +36,7 @@ #undef TEXT #define TEXT(s) L##s #include <regstr.h> +#include <ntstrsafe.h> /* FIXME: Temporary until Winldr is used */ #include <rosldr.h>

1 0

[rharabien] 51135: [PSDK] Import strsafe.h from mingw-w64. It's more complete compared to our headers [DDK] Import ntstrsafe.h from mingw-w64 (converted from strsafe.h). It's more complete compared...
by rharabien＠svn.reactos.org 25 Mar '11

25 Mar '11

Author: rharabien Date: Fri Mar 25 21:42:48 2011 New Revision: 51135 URL: http://svn.reactos.org/svn/reactos?rev=51135&view=rev Log: [PSDK] Import strsafe.h from mingw-w64. It's more complete compared to our headers [DDK] Import ntstrsafe.h from mingw-w64 (converted from strsafe.h). It's more complete compared to our headers [NTOSKRNL] Use sizeof instead of magic numbers Let's use strsafe functions now instead of strncpy/wcsncpy, which doesn't always NULL terminate :) Modified: trunk/reactos/base/applications/notepad/notepad.h trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/include/psdk/strsafe.h trunk/reactos/ntoskrnl/ex/init.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/notepad/notepad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… Modified: trunk/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/strsafe.h?rev… Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=511…

1 0

[tkreuzer] 51134: [MKHIVE] Fix MSVC warnings and remove unneccessary definitions
by tkreuzer＠svn.reactos.org 25 Mar '11

25 Mar '11

Author: tkreuzer Date: Fri Mar 25 20:01:20 2011 New Revision: 51134 URL: http://svn.reactos.org/svn/reactos?rev=51134&view=rev Log: [MKHIVE] Fix MSVC warnings and remove unneccessary definitions Modified: branches/cmake-bringup/tools/mkhive/mkhive.h Modified: branches/cmake-bringup/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/mkhive/mkhi… ============================================================================== --- branches/cmake-bringup/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/mkhive/mkhive.h [iso-8859-1] Fri Mar 25 20:01:20 2011 @@ -46,8 +46,8 @@ #define STATUS_INVALID_PARAMETER_2 ((NTSTATUS)0xC00000F0) #define STATUS_BUFFER_OVERFLOW ((NTSTATUS)0x80000005) -unsigned char BitScanForward(ULONG * Index, const unsigned long Mask); -unsigned char BitScanReverse(ULONG * const Index, const unsigned long Mask); +unsigned char BitScanForward(ULONG * Index, unsigned long Mask); +unsigned char BitScanReverse(ULONG * const Index, unsigned long Mask); #define RtlFillMemoryUlong(dst, len, val) memset(dst, val, len) NTSTATUS NTAPI @@ -66,6 +66,46 @@ WCHAR NTAPI RtlUpcaseUnicodeChar( IN WCHAR Source); + +LONG WINAPI +RegQueryValueExW( + IN HKEY hKey, + IN LPCWSTR lpValueName, + IN PULONG lpReserved, + OUT PULONG lpType, + OUT PUCHAR lpData, + OUT PSIZE_T lpcbData); + +LONG WINAPI +RegSetValueExW( + IN HKEY hKey, + IN LPCWSTR lpValueName OPTIONAL, + IN ULONG Reserved, + IN ULONG dwType, + IN const UCHAR* lpData, + IN USHORT cbData); + +LONG WINAPI +RegDeleteKeyW( + IN HKEY hKey, + IN LPCWSTR lpSubKey); + +LONG WINAPI +RegDeleteValueW( + IN HKEY hKey, + IN LPCWSTR lpValueName OPTIONAL); + +LONG WINAPI +RegCreateKeyW( + IN HKEY hKey, + IN LPCWSTR lpSubKey, + OUT PHKEY phkResult); + +LONG WINAPI +RegOpenKeyW( + IN HKEY hKey, + IN LPCWSTR lpSubKey, + OUT PHKEY phkResult); #define CMLIB_HOST #include <cmlib.h> @@ -95,11 +135,5 @@ #include <string.h> #endif//_WIN32 -#ifdef _MSC_VER -#define GCC_PACKED -#define inline -#else//_MSC_VER -#define GCC_PACKED __attribute__((packed)) -#endif//_MSC_VER /* EOF */

1 0

[ilardig] 51133: [SHELL32] Italian & Spanish fixes + RunFileDlg translations
by ilardig＠svn.reactos.org 24 Mar '11

24 Mar '11

Author: ilardig Date: Thu Mar 24 08:34:49 2011 New Revision: 51133 URL: http://svn.reactos.org/svn/reactos?rev=51133&view=rev Log: [SHELL32] Italian & Spanish fixes + RunFileDlg translations Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu Mar 24 08:34:49 2011 @@ -113,8 +113,8 @@ CAPTION "Mensaje" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Si", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Si &a todo", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Sí", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Sí &a todo", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Cancelar", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 @@ -156,7 +156,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Introduzca el nombre de un programa, carpeta, documento o recurso de Internet, y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 24 + LTEXT "Introduzca el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 24 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "Aceptar", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -682,10 +682,10 @@ IDS_LOGOFF_PROMPT "¿Desea cerrar la sesión?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Imposible mostrar el diálogo Ejecutar (error interno)" + IDS_RUNDLG_BROWSE_ERROR "Imposible mostrar el diálogo Examinar (error interno)" + IDS_RUNDLG_BROWSE_CAPTION "Examinar" + IDS_RUNDLG_BROWSE_FILTER "Archivos ejecutables (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menú Inicio\\Programas" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu Mar 24 08:34:49 2011 @@ -111,8 +111,8 @@ CAPTION "Messaggi" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Si", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Si a &tutti", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Sì", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Sì a &tutti", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Annulla", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 @@ -154,7 +154,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18 + LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18 LTEXT "&Apri:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -297,7 +297,7 @@ LTEXT "Disco %s", 14009, 100, 170, 40, 10 PUSHBUTTON "Pulitura disco", 14010, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Permettere di indicizzare questo disco al servizio di indicizzazione per avere ricerche dei file più rapide", 14012, 15, 220, 200, 10, WS_DISABLED + CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 @@ -445,7 +445,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Sì", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Sì &tutti", 12807, 85, 122, 60, 14 + PUSHBUTTON "Sì a &tutti", 12807, 85, 122, 60, 14 PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 PUSHBUTTON "Annulla", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL @@ -466,7 +466,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Siete sicuro di voler Chiudere la sessione?", -1, 43, 11, 140, 22 + LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 43, 11, 140, 22 DEFPUSHBUTTON "&Chiudi sessione", IDOK, 57, 40, 60, 14 PUSHBUTTON "Annulla", IDCANCEL, 122, 40, 60, 14 END @@ -583,7 +583,7 @@ GROUPBOX "Opzioni per la verifica del disco", -1, 7, 6, 179, 50 PUSHBUTTON "Annulla", IDCANCEL, 118, 100, 60, 14 AUTOCHECKBOX "Correggi automaticamente gli errori", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Ricerca dei settori difettosi e tentativo di correzione", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Cerca i settori difettosi e tenta di correggerli", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -680,10 +680,10 @@ IDS_LOGOFF_PROMPT "Volete disconnettervi?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Impossibile mostrare il dialogo Eseguire (errore interno)" + IDS_RUNDLG_BROWSE_ERROR "Impossibile mostrare il dialogo sfoglia (errore interno)" + IDS_RUNDLG_BROWSE_CAPTION "Sfoglia" + IDS_RUNDLG_BROWSE_FILTER "File Eseguibili (*.exe)\0*.exe\0Tutti i file (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Avvio\\Programmi" @@ -733,22 +733,22 @@ IDS_RECYCLEBIN_LOCATION "Posizione del Cestino" IDS_RECYCLEBIN_DISKSPACE "Spazio disponibile" IDS_EMPTY_BITBUCKET "Svuota cestino" - IDS_PICK_ICON_TITLE "Scegliere un icona" - IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_TITLE "Scegliere un'icona" + IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Tutti i file (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0Tutti i file (*.*)\0*.*\0" IDS_DIRECTORY "Cartella" - IDS_VIRTUAL_DRIVER "Virtual Device Driver" - IDS_BAT_FILE "ReactOS Batch File" - IDS_CMD_FILE "ReactOS Command Script" - IDS_COM_FILE "Applicazione Dos" + IDS_VIRTUAL_DRIVER "Driver di Periferica Virtuale" + IDS_BAT_FILE "File Batch ReactOS" + IDS_CMD_FILE "Script di comandi ReactOS" + IDS_COM_FILE "Applicazione DOS" IDS_CPL_FILE "Elemento del pannello di controllo" IDS_CUR_FILE "Cursore" IDS_DLL_FILE "Estensione di applicazione" - IDS_DRV_FILE "Device Driver" + IDS_DRV_FILE "Driver di periferica" IDS_EXE_FILE "Applicazione" IDS_FON_FILE "Font" IDS_TTF_FILE "TrueType Font" - IDS_HLP_FILE "Help File" + IDS_HLP_FILE "File della guida" IDS_INI_FILE "Impostazioni di configurazione" IDS_LNK_FILE "Collegamento" IDS_SYS_FILE "File di sistema"

1 0

[akhaldi] 51132: [BUILD] - Remove redundant -fms-extensions as we set it globally already.
by akhaldi＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: akhaldi Date: Wed Mar 23 23:17:45 2011 New Revision: 51132 URL: http://svn.reactos.org/svn/reactos?rev=51132&view=rev Log: [BUILD] - Remove redundant -fms-extensions as we set it globally already. Modified: trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild trunk/reactos/drivers/video/videoprt/videoprt.rbuild trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Wed Mar 23 23:17:45 2011 @@ -12,7 +12,6 @@ <library>win32ksys</library> <library>pseh</library> <library>ntdll</library> - <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <directory name="include"> <pch>user32.h</pch> </directory> Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Wed Mar 23 23:17:45 2011 @@ -6,5 +6,4 @@ <library>hal</library> <file>ramdisk.c</file> <file>ramdisk.rc</file> - <compilerflag compilerset="gcc">-fms-extensions</compilerflag> </module> Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] Wed Mar 23 23:17:45 2011 @@ -5,7 +5,6 @@ <include base="videoprt">.</include> <include base="ntoskrnl">include</include> <define name="_VIDEOPORT_" /> - <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <library>ntoskrnl</library> <library>hal</library> <pch>videoprt.h</pch> Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] Wed Mar 23 23:17:45 2011 @@ -6,7 +6,6 @@ <include base="csrss">include</include> <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> - <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <library>nt</library> <library>ntdll</library> <library>csrsrv</library> Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Wed Mar 23 23:17:45 2011 @@ -7,7 +7,6 @@ <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> <include base="console">.</include> - <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <library>ntdll</library> <library delayimport="true">user32</library> <library delayimport="true">gdi32</library> Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Wed Mar 23 23:17:45 2011 @@ -16,7 +16,6 @@ <include base="freetype">include</include> <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> - <compilerflag compilerset="gcc">-fms-extensions</compilerflag> <compilerflag compilerset="msc">/wd4276</compilerflag> <define name="LANGPACK" /> <define name="_WIN32K_" />

1 0

[rharabien] 51131: Revert previous commit Sorry... I'll test first next time.
by rharabien＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: rharabien Date: Wed Mar 23 20:48:20 2011 New Revision: 51131 URL: http://svn.reactos.org/svn/reactos?rev=51131&view=rev Log: Revert previous commit Sorry... I'll test first next time. Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Wed Mar 23 20:48:20 2011 @@ -17,7 +17,6 @@ #include <stdio.h> #include <string.h> #include <stdarg.h> -#include <windef.h> /* we need DWORD */ // // Maximum limits: allow overriding the maximum @@ -27,6 +26,11 @@ #endif #define NTSTRSAFE_MAX_LENGTH (NTSTRSAFE_MAX_CCH - 1) +// +// Typedefs +// +typedef unsigned long DWORD; + /* PRIVATE FUNCTIONS *********************************************************/ static __inline @@ -40,39 +44,6 @@ SIZE_T LocalMax = MaxLength; while (MaxLength && (*String != ANSI_NULL)) - { - String++; - MaxLength--; - } - - if (!MaxLength) Status = STATUS_INVALID_PARAMETER; - - if (ReturnLength) - { - if (NT_SUCCESS(Status)) - { - *ReturnLength = LocalMax - MaxLength; - } - else - { - *ReturnLength = 0; - } - } - - return Status; -} - -static __inline -NTSTATUS -NTAPI -RtlStringLengthWorkerW(IN LPCWSTR String, - IN SIZE_T MaxLength, - OUT PSIZE_T ReturnLength OPTIONAL) -{ - NTSTATUS Status = STATUS_SUCCESS; - SIZE_T LocalMax = MaxLength; - - while (MaxLength && (*String != UNICODE_NULL)) { String++; MaxLength--; @@ -112,35 +83,6 @@ if (NT_SUCCESS(Status)) { Status = RtlStringLengthWorkerA(Destination, - Length, - ReturnLength); - } - else - { - *ReturnLength = 0; - } - } - - return Status; -} - -static __inline -NTSTATUS -NTAPI -RtlStringValidateDestW(IN LPWSTR Destination, - IN SIZE_T Length, - OUT PSIZE_T ReturnLength OPTIONAL, - IN SIZE_T MaxLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - - if (!(Length) || (Length > MaxLength)) Status = STATUS_INVALID_PARAMETER; - - if (ReturnLength) - { - if (NT_SUCCESS(Status)) - { - Status = RtlStringLengthWorkerW(Destination, Length, ReturnLength); } @@ -172,42 +114,7 @@ static __inline NTSTATUS NTAPI -RtlStringExValidateDestW(IN OUT LPWSTR *Destination, - IN OUT PSIZE_T DestinationLength, - OUT PSIZE_T ReturnLength OPTIONAL, - IN SIZE_T MaxLength, - IN DWORD Flags) -{ - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); - return RtlStringValidateDestW(*Destination, - *DestinationLength, - ReturnLength, - MaxLength); -} - -static __inline -NTSTATUS -NTAPI RtlStringExValidateSrcA(IN OUT LPCSTR *Source OPTIONAL, - IN OUT PSIZE_T ReturnLength OPTIONAL, - IN SIZE_T MaxLength, - IN DWORD Flags) -{ - NTSTATUS Status = STATUS_SUCCESS; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); - - if ((ReturnLength) && (*ReturnLength >= MaxLength)) - { - Status = STATUS_INVALID_PARAMETER; - } - - return Status; -} - -static __inline -NTSTATUS -NTAPI -RtlStringExValidateSrcW(IN OUT LPCWSTR *Source OPTIONAL, IN OUT PSIZE_T ReturnLength OPTIONAL, IN SIZE_T MaxLength, IN DWORD Flags) @@ -299,41 +206,6 @@ return Status; } -static __inline -NTSTATUS -NTAPI -RtlStringCopyWorkerW(OUT LPWSTR Destination, - IN SIZE_T Length, - OUT PSIZE_T NewLength OPTIONAL, - IN LPCWSTR Source, - IN SIZE_T CopyLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - SIZE_T LocalNewLength = 0; - - while ((Length) && (CopyLength) && (*Source != UNICODE_NULL)) - { - *Destination++ = *Source++; - Length--; - CopyLength--; - - LocalNewLength++; - } - - if (!Length) - { - Destination--; - LocalNewLength--; - - Status = STATUS_BUFFER_OVERFLOW; - } - - *Destination = UNICODE_NULL; - - if (NewLength) *NewLength = LocalNewLength; - return Status; -} - /* PUBLIC FUNCTIONS **********************************************************/ static __inline @@ -342,17 +214,6 @@ RtlStringCchCopyA(IN LPSTR Destination, IN SIZE_T cchDest, IN LPCSTR pszSrc) -{ - ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -static __inline -NTSTATUS -NTAPI -RtlStringCchCopyW(IN LPWSTR Destination, - IN SIZE_T cchDest, - IN LPCWSTR pszSrc) { ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE); return STATUS_NOT_IMPLEMENTED; @@ -633,80 +494,6 @@ static __inline NTSTATUS NTAPI -RtlStringCbCatExW(IN OUT LPWSTR Destination, - IN SIZE_T Length, - IN LPCWSTR Source, - OUT LPWSTR *DestinationEnd OPTIONAL, - OUT PSIZE_T RemainingSize OPTIONAL, - IN DWORD Flags) -{ - NTSTATUS Status; - SIZE_T CharLength = Length / sizeof(WCHAR); - SIZE_T DestinationLength, Remaining, Copied = 0; - PWCHAR LocalDestinationEnd; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); - - Status = RtlStringExValidateDestW(&Destination, - &CharLength, - &DestinationLength, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - LocalDestinationEnd = Destination + DestinationLength; - Remaining = CharLength - DestinationLength; - - Status = RtlStringExValidateSrcW(&Source, - NULL, - NTSTRSAFE_MAX_CCH, - Flags); - if (NT_SUCCESS(Status)) - { - if (Remaining <= 1) - { - if (*Source != UNICODE_NULL) - { - if (!Destination) - { - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = STATUS_BUFFER_OVERFLOW; - } - } - } - else - { - Status = RtlStringCopyWorkerW(LocalDestinationEnd, - Remaining, - &Copied, - Source, - NTSTRSAFE_MAX_LENGTH); - - LocalDestinationEnd = LocalDestinationEnd + Copied; - Remaining = Remaining - Copied; - } - } - - if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) - { - if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; - - if (RemainingSize) - { - *RemainingSize = (Remaining * sizeof(WCHAR)) + - (Length % sizeof(WCHAR)); - } - } - } - - return Status; -} - -static __inline -NTSTATUS -NTAPI RtlStringCbCopyA(OUT LPSTR Destination, IN SIZE_T Length, IN LPCSTR Source) @@ -730,30 +517,4 @@ return Status; } -static __inline -NTSTATUS -NTAPI -RtlStringCbCopyW(OUT LPWSTR Destination, - IN SIZE_T Length, - IN LPCWSTR Source) -{ - NTSTATUS Status; - SIZE_T CharLength = Length / sizeof(WCHAR); - - Status = RtlStringValidateDestW(Destination, - CharLength, - NULL, - NTSTRSAFE_MAX_CCH); - if (NT_SUCCESS(Status)) - { - Status = RtlStringCopyWorkerW(Destination, - CharLength, - NULL, - Source, - NTSTRSAFE_MAX_LENGTH); - } - - return Status; -} - #endif /* _NTSTRSAFE_H_INCLUDED_ */

1 0

[rharabien] 51130: [DDK] Add most of RtlString***W functions based on ANSI versions.
by rharabien＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: rharabien Date: Wed Mar 23 20:36:25 2011 New Revision: 51130 URL: http://svn.reactos.org/svn/reactos?rev=51130&view=rev Log: [DDK] Add most of RtlString***W functions based on ANSI versions. Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Wed Mar 23 20:36:25 2011 @@ -17,6 +17,7 @@ #include <stdio.h> #include <string.h> #include <stdarg.h> +#include <windef.h> /* we need DWORD */ // // Maximum limits: allow overriding the maximum @@ -26,11 +27,6 @@ #endif #define NTSTRSAFE_MAX_LENGTH (NTSTRSAFE_MAX_CCH - 1) -// -// Typedefs -// -typedef unsigned long DWORD; - /* PRIVATE FUNCTIONS *********************************************************/ static __inline @@ -44,6 +40,39 @@ SIZE_T LocalMax = MaxLength; while (MaxLength && (*String != ANSI_NULL)) + { + String++; + MaxLength--; + } + + if (!MaxLength) Status = STATUS_INVALID_PARAMETER; + + if (ReturnLength) + { + if (NT_SUCCESS(Status)) + { + *ReturnLength = LocalMax - MaxLength; + } + else + { + *ReturnLength = 0; + } + } + + return Status; +} + +static __inline +NTSTATUS +NTAPI +RtlStringLengthWorkerW(IN LPCWSTR String, + IN SIZE_T MaxLength, + OUT PSIZE_T ReturnLength OPTIONAL) +{ + NTSTATUS Status = STATUS_SUCCESS; + SIZE_T LocalMax = MaxLength; + + while (MaxLength && (*String != UNICODE_NULL)) { String++; MaxLength--; @@ -83,6 +112,35 @@ if (NT_SUCCESS(Status)) { Status = RtlStringLengthWorkerA(Destination, + Length, + ReturnLength); + } + else + { + *ReturnLength = 0; + } + } + + return Status; +} + +static __inline +NTSTATUS +NTAPI +RtlStringValidateDestW(IN LPWSTR Destination, + IN SIZE_T Length, + OUT PSIZE_T ReturnLength OPTIONAL, + IN SIZE_T MaxLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Length) || (Length > MaxLength)) Status = STATUS_INVALID_PARAMETER; + + if (ReturnLength) + { + if (NT_SUCCESS(Status)) + { + Status = RtlStringLengthWorkerW(Destination, Length, ReturnLength); } @@ -114,7 +172,42 @@ static __inline NTSTATUS NTAPI +RtlStringExValidateDestW(IN OUT LPWSTR *Destination, + IN OUT PSIZE_T DestinationLength, + OUT PSIZE_T ReturnLength OPTIONAL, + IN SIZE_T MaxLength, + IN DWORD Flags) +{ + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + return RtlStringValidateDestW(*Destination, + *DestinationLength, + ReturnLength, + MaxLength); +} + +static __inline +NTSTATUS +NTAPI RtlStringExValidateSrcA(IN OUT LPCSTR *Source OPTIONAL, + IN OUT PSIZE_T ReturnLength OPTIONAL, + IN SIZE_T MaxLength, + IN DWORD Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + + if ((ReturnLength) && (*ReturnLength >= MaxLength)) + { + Status = STATUS_INVALID_PARAMETER; + } + + return Status; +} + +static __inline +NTSTATUS +NTAPI +RtlStringExValidateSrcW(IN OUT LPCWSTR *Source OPTIONAL, IN OUT PSIZE_T ReturnLength OPTIONAL, IN SIZE_T MaxLength, IN DWORD Flags) @@ -206,6 +299,41 @@ return Status; } +static __inline +NTSTATUS +NTAPI +RtlStringCopyWorkerW(OUT LPWSTR Destination, + IN SIZE_T Length, + OUT PSIZE_T NewLength OPTIONAL, + IN LPCWSTR Source, + IN SIZE_T CopyLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + SIZE_T LocalNewLength = 0; + + while ((Length) && (CopyLength) && (*Source != UNICODE_NULL)) + { + *Destination++ = *Source++; + Length--; + CopyLength--; + + LocalNewLength++; + } + + if (!Length) + { + Destination--; + LocalNewLength--; + + Status = STATUS_BUFFER_OVERFLOW; + } + + *Destination = UNICODE_NULL; + + if (NewLength) *NewLength = LocalNewLength; + return Status; +} + /* PUBLIC FUNCTIONS **********************************************************/ static __inline @@ -214,6 +342,17 @@ RtlStringCchCopyA(IN LPSTR Destination, IN SIZE_T cchDest, IN LPCSTR pszSrc) +{ + ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +static __inline +NTSTATUS +NTAPI +RtlStringCchCopyW(IN LPWSTR Destination, + IN SIZE_T cchDest, + IN LPCWSTR pszSrc) { ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE); return STATUS_NOT_IMPLEMENTED; @@ -494,6 +633,80 @@ static __inline NTSTATUS NTAPI +RtlStringCbCatExW(IN OUT LPWSTR Destination, + IN SIZE_T Length, + IN LPCWSTR Source, + OUT LPWSTR *DestinationEnd OPTIONAL, + OUT PSIZE_T RemainingSize OPTIONAL, + IN DWORD Flags) +{ + NTSTATUS Status; + SIZE_T CharLength = Length / sizeof(WCHAR); + SIZE_T DestinationLength, Remaining, Copied = 0; + PWCHAR LocalDestinationEnd; + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + + Status = RtlStringExValidateDestW(&Destination, + &CharLength, + &DestinationLength, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + LocalDestinationEnd = Destination + DestinationLength; + Remaining = CharLength - DestinationLength; + + Status = RtlStringExValidateSrcW(&Source, + NULL, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + if (Remaining <= 1) + { + if (*Source != UNICODE_NULL) + { + if (!Destination) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + } + } + } + else + { + Status = RtlStringCopyWorkerW(LocalDestinationEnd, + Remaining, + &Copied, + Source, + NTSTRSAFE_MAX_LENGTH); + + LocalDestinationEnd = LocalDestinationEnd + Copied; + Remaining = Remaining - Copied; + } + } + + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; + + if (RemainingSize) + { + *RemainingSize = (Remaining * sizeof(WCHAR)) + + (Length % sizeof(WCHAR)); + } + } + } + + return Status; +} + +static __inline +NTSTATUS +NTAPI RtlStringCbCopyA(OUT LPSTR Destination, IN SIZE_T Length, IN LPCSTR Source) @@ -517,4 +730,30 @@ return Status; } +static __inline +NTSTATUS +NTAPI +RtlStringCbCopyW(OUT LPWSTR Destination, + IN SIZE_T Length, + IN LPCWSTR Source) +{ + NTSTATUS Status; + SIZE_T CharLength = Length / sizeof(WCHAR); + + Status = RtlStringValidateDestW(Destination, + CharLength, + NULL, + NTSTRSAFE_MAX_CCH); + if (NT_SUCCESS(Status)) + { + Status = RtlStringCopyWorkerW(Destination, + CharLength, + NULL, + Source, + NTSTRSAFE_MAX_LENGTH); + } + + return Status; +} + #endif /* _NTSTRSAFE_H_INCLUDED_ */

1 0

[rharabien] 51129: [WIN32K] Remove a useless if in cliprgn.c Patch by Thomas Faber <thfabba at gmx dot de> See issue #6015 for more details.
by rharabien＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: rharabien Date: Wed Mar 23 17:11:40 2011 New Revision: 51129 URL: http://svn.reactos.org/svn/reactos?rev=51129&view=rev Log: [WIN32K] Remove a useless if in cliprgn.c Patch by Thomas Faber <thfabba at gmx dot de> See issue #6015 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Wed Mar 23 17:11:40 2011 @@ -26,20 +26,13 @@ CLIPPING_UpdateGCRegion(DC* Dc) { PROSRGNDATA CombinedRegion; - HRGN hRgnVis = Dc->prgnVis->BaseObject.hHmgr; + HRGN hRgnVis; // would prefer this, but the rest of the code sucks // ASSERT(Dc->rosdc.hGCClipRgn); // ASSERT(Dc->rosdc.hClipRgn); - if (!Dc->prgnVis) - { - DPRINT1("Warning, prgnVis is NULL!\n"); - } - else - { - hRgnVis = Dc->prgnVis->BaseObject.hHmgr ; - } - + ASSERT(Dc->prgnVis); + hRgnVis = Dc->prgnVis->BaseObject.hHmgr; if (Dc->rosdc.hGCClipRgn == NULL) Dc->rosdc.hGCClipRgn = IntSysCreateRectRgn(0, 0, 0, 0);

1 0

[rharabien] 51128: [USER32] Gray close button if SC_CLOSE is disabled is sysmenu or class has CS_NOCLOSE flag See issue #5272 for more details.
by rharabien＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: rharabien Date: Wed Mar 23 16:51:26 2011 New Revision: 51128 URL: http://svn.reactos.org/svn/reactos?rev=51128&view=rev Log: [USER32] Gray close button if SC_CLOSE is disabled is sysmenu or class has CS_NOCLOSE flag See issue #5272 for more details. Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Wed Mar 23 16:51:26 2011 @@ -161,7 +161,7 @@ * - Center the buttons verticaly in the rect */ VOID -UserDrawCaptionButton(LPRECT Rect, DWORD Style, DWORD ExStyle, HDC hDC, BOOL bDown, ULONG Type) +UserDrawCaptionButton(HWND hWnd, LPRECT Rect, DWORD Style, DWORD ExStyle, HDC hDC, BOOL bDown, ULONG Type) { RECT TempRect; @@ -214,6 +214,9 @@ } case DFCS_CAPTIONCLOSE: { + HMENU hSysMenu = GetSystemMenu(hWnd, FALSE); + UINT MenuState = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */ + /* FIXME: A tool window has a smaller Close button */ if (ExStyle & WS_EX_TOOLWINDOW) @@ -231,7 +234,7 @@ DrawFrameControl(hDC, &TempRect, DFC_CAPTION, (DFCS_CAPTIONCLOSE | (bDown ? DFCS_PUSHED : 0) | - ((Style & WS_SYSMENU) ? 0 : DFCS_INACTIVE))); + ((!(MenuState & (MF_GRAYED|MF_DISABLED)) && !(GetClassLong(hWnd, GCL_STYLE) & CS_NOCLOSE)) ? 0 : DFCS_INACTIVE))); break; } } @@ -252,7 +255,7 @@ ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); UserGetWindowBorders(Style, ExStyle, &WindowBorder, FALSE); InflateRect(&WindowRect, -WindowBorder.cx, -WindowBorder.cy); - UserDrawCaptionButton(&WindowRect, Style, ExStyle, hDC, bDown, Type); + UserDrawCaptionButton(hWnd, &WindowRect, Style, ExStyle, hDC, bDown, Type); } // Note from Wine: @@ -419,11 +422,11 @@ /* Draw buttons */ if (Style & WS_SYSMENU) { - UserDrawCaptionButton(&TempRect, Style, ExStyle, hDC, FALSE, DFCS_CAPTIONCLOSE); + UserDrawCaptionButton(hWnd, &TempRect, Style, ExStyle, hDC, FALSE, DFCS_CAPTIONCLOSE); if ((Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) && !(ExStyle & WS_EX_TOOLWINDOW)) { - UserDrawCaptionButton(&TempRect, Style, ExStyle, hDC, FALSE, DFCS_CAPTIONMIN); - UserDrawCaptionButton(&TempRect, Style, ExStyle, hDC, FALSE, DFCS_CAPTIONMAX); + UserDrawCaptionButton(hWnd, &TempRect, Style, ExStyle, hDC, FALSE, DFCS_CAPTIONMIN); + UserDrawCaptionButton(hWnd, &TempRect, Style, ExStyle, hDC, FALSE, DFCS_CAPTIONMAX); } } if(!(Style & WS_MINIMIZE)) @@ -665,8 +668,8 @@ RECT WindowRect, ClientRect, OrigWndRect; POINT ClientPoint; SIZE WindowBorders; - ULONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); - ULONG ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); + DWORD Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + DWORD ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); GetWindowRect(hWnd, &WindowRect); if (!PtInRect(&WindowRect, Point)) @@ -787,8 +790,6 @@ if(!(Style & WS_MINIMIZE)) { - HMENU menu; - ClientPoint = Point; ScreenToClient(hWnd, &ClientPoint); GetClientRect(hWnd, &ClientRect); @@ -798,7 +799,7 @@ return HTCLIENT; } - if ((menu = GetMenu(hWnd)) && !(Style & WS_CHILD)) + if (GetMenu(hWnd) && !(Style & WS_CHILD)) { if (Point.x > 0 && Point.x < WindowRect.right && ClientPoint.y < 0) return HTMENU; @@ -878,13 +879,18 @@ HDC WindowDC; BOOL Pressed = TRUE, OldState; WPARAM SCMsg; - ULONG ButtonType, Style; + HMENU hSysMenu; + ULONG ButtonType; + DWORD Style; + UINT MenuState; Style = GetWindowLongPtrW(hWnd, GWL_STYLE); switch (wParam) { case HTCLOSE: - if (!(Style & WS_SYSMENU)) + hSysMenu = GetSystemMenu(hWnd, FALSE); + MenuState = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */ + if (!(Style & WS_SYSMENU) || (MenuState & (MF_GRAYED|MF_DISABLED)) || (GetClassLongPtrW(hWnd, GCL_STYLE) & CS_NOCLOSE)) return; ButtonType = DFCS_CAPTIONCLOSE; SCMsg = SC_CLOSE;

1 0

[rharabien] 51127: [SHELL32] Sync RunFileDlg to wine. It was crashing for one char input. Add "All files (*.*)" filter to RunDlg and OpenWith dialogs. Improved polish translation. Translators: plea...
by rharabien＠svn.reactos.org 23 Mar '11

23 Mar '11

Author: rharabien Date: Wed Mar 23 16:22:38 2011 New Revision: 51127 URL: http://svn.reactos.org/svn/reactos?rev=51127&view=rev Log: [SHELL32] Sync RunFileDlg to wine. It was crashing for one char input. Add "All files (*.*)" filter to RunDlg and OpenWith dialogs. Improved polish translation. Translators: please localize rest... Modified: trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/she_ocmenu.c trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -25,17 +25,17 @@ { HWND hwndOwner ; HICON hIcon ; - LPCSTR lpstrDirectory ; - LPCSTR lpstrTitle ; - LPCSTR lpstrDescription ; + LPCWSTR lpstrDirectory ; + LPCWSTR lpstrTitle ; + LPCWSTR lpstrDescription ; UINT uFlags ; } RUNFILEDLGPARAMS ; -typedef BOOL (*LPFNOFN) (OPENFILENAMEA *) ; +typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *) ; WINE_DEFAULT_DEBUG_CHANNEL(shell); static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ; -static void FillList (HWND, char *) ; +static void FillList (HWND, char *, BOOL) ; /************************************************************************* @@ -261,20 +261,19 @@ } /************************************************************************* - * RunFileDlg [SHELL32.61] + * RunFileDlg [internal] * - * NOTES - * Original name: RunFileDlg (exported by ordinal) + * The Unicode function that is available as ordinal 61 on Windows NT/2000/XP/... */ void WINAPI RunFileDlg( HWND hwndOwner, HICON hIcon, - LPCSTR lpstrDirectory, - LPCSTR lpstrTitle, - LPCSTR lpstrDescription, + LPCWSTR lpstrDirectory, + LPCWSTR lpstrTitle, + LPCWSTR lpstrDescription, UINT uFlags) { - + static const WCHAR resnameW[] = {'S','H','E','L','L','_','R','U','N','_','D','L','G',0}; RUNFILEDLGPARAMS rfdp; HRSRC hRes; LPVOID template; @@ -287,43 +286,105 @@ rfdp.lpstrDescription = lpstrDescription; rfdp.uFlags = uFlags; - if(!(hRes = FindResourceA(shell32_hInstance, "SHELL_RUN_DLG", (LPSTR)RT_DIALOG))) - { - MessageBoxA (hwndOwner, "Couldn't find dialog.", "Nix", MB_OK) ; + if (!(hRes = FindResourceW(shell32_hInstance, resnameW, (LPWSTR)RT_DIALOG)) || + !(template = LoadResource(shell32_hInstance, hRes))) + { + ERR("Couldn't load SHELL_RUN_DLG resource\n"); + ShellMessageBoxW(shell32_hInstance, hwndOwner, MAKEINTRESOURCEW(IDS_RUNDLG_ERROR), NULL, MB_OK | MB_ICONERROR); return; - } - if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) - { - MessageBoxA (hwndOwner, "Couldn't load dialog.", "Nix", MB_OK) ; - return; - } - - DialogBoxIndirectParamA((HINSTANCE)GetWindowLongPtrW( hwndOwner, - GWLP_HINSTANCE ), + } + + DialogBoxIndirectParamW(shell32_hInstance, template, hwndOwner, RunDlgProc, (LPARAM)&rfdp); +} + +/* find the directory that contains the file being run */ +static LPWSTR RunDlg_GetParentDir(LPCWSTR cmdline) +{ + const WCHAR *src; + WCHAR *dest, *result, *result_end=NULL; + static const WCHAR dotexeW[] = {'.','e','x','e',0}; + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(strlenW(cmdline)+5)); + + src = cmdline; + dest = result; + + if (*src == '"') + { + src++; + while (*src && *src != '"') + { + if (*src == '\\') + result_end = dest; + *dest++ = *src++; + } + } + else { + while (*src) + { + if (isspaceW(*src)) + { + *dest = 0; + if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) + break; + strcatW(dest, dotexeW); + if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) + break; + } + else if (*src == '\\') + result_end = dest; + *dest++ = *src++; + } + } + + if (result_end) + { + *result_end = 0; + return result; + } + else + { + HeapFree(GetProcessHeap(), 0, result); + return NULL; + } } /* Dialog procedure for RunFileDlg */ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - int ic ; - char *psz, *pdir, szMsg[256]; - static RUNFILEDLGPARAMS *prfdp = NULL ; + RUNFILEDLGPARAMS *prfdp = (RUNFILEDLGPARAMS *)GetWindowLongPtrW(hwnd, DWLP_USER); switch (message) { case WM_INITDIALOG : prfdp = (RUNFILEDLGPARAMS *)lParam ; + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)prfdp); if (prfdp->lpstrTitle) - SetWindowTextA (hwnd, prfdp->lpstrTitle) ; - - SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; - SendMessageW (GetDlgItem (hwnd, 12297), STM_SETICON, - (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); - FillList (GetDlgItem (hwnd, 12298), NULL) ; - SetFocus (GetDlgItem (hwnd, 12298)) ; + SetWindowTextW(hwnd, prfdp->lpstrTitle); + if (prfdp->lpstrDescription) + SetWindowTextW(GetDlgItem(hwnd, IDC_RUNDLG_DESCRIPTION), prfdp->lpstrDescription); + if (prfdp->uFlags & RFF_NOBROWSE) + { + HWND browse = GetDlgItem(hwnd, IDC_RUNDLG_BROWSE); + ShowWindow(browse, SW_HIDE); + EnableWindow(browse, FALSE); + } + if (prfdp->uFlags & RFF_NOLABEL) + ShowWindow(GetDlgItem(hwnd, IDC_RUNDLG_LABEL), SW_HIDE); + if (prfdp->uFlags & RFF_CALCDIRECTORY) + FIXME("RFF_CALCDIRECTORY not supported\n"); + + if (prfdp->hIcon == NULL) + prfdp->hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO); + SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)prfdp->hIcon); + SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); + SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); + + FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0) ; + SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)) ; return TRUE ; case WM_COMMAND : @@ -331,46 +392,45 @@ { case IDOK : { - HWND htxt = NULL ; - if ((ic = GetWindowTextLengthA (htxt = GetDlgItem (hwnd, 12298)))) + int ic ; + HWND htxt = GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH); + if ((ic = GetWindowTextLengthW (htxt))) { - psz = HeapAlloc( GetProcessHeap(), 0, (ic + 2) ); - GetWindowTextA (htxt, psz, ic + 1) ; - pdir = HeapAlloc( GetProcessHeap(), 0, (ic + 2) ); - if (pdir) - { - char * ptr; - strcpy(pdir, psz); - ptr = strrchr(pdir + 4, '\\'); - if(ptr) - ptr[0] = '\0'; - else - pdir[3] = '\0'; - } - if (ShellExecuteA(NULL, NULL, psz, NULL, pdir, SW_SHOWNORMAL) < (HINSTANCE)33) - { - char *pszSysMsg = NULL ; - FormatMessageA ( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, GetLastError (), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPSTR)&pszSysMsg, 0, NULL - ) ; - sprintf (szMsg, "Error: %s", pszSysMsg) ; - LocalFree ((HLOCAL)pszSysMsg) ; - MessageBoxA (hwnd, szMsg, NULL, MB_OK | MB_ICONEXCLAMATION) ; - + WCHAR *psz, *parent=NULL ; + SHELLEXECUTEINFOW sei ; + + ZeroMemory (&sei, sizeof(sei)) ; + sei.cbSize = sizeof(sei) ; + psz = HeapAlloc( GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR) ); + GetWindowTextW (htxt, psz, ic + 1) ; + + /* according to http://www.codeproject.com/KB/shell/runfiledlg.aspx we should send a + * WM_NOTIFY before execution */ + + sei.hwnd = hwnd; + sei.nShow = SW_SHOWNORMAL; + sei.lpFile = psz; + + if (prfdp->lpstrDirectory) + sei.lpDirectory = prfdp->lpstrDirectory; + else + sei.lpDirectory = parent = RunDlg_GetParentDir(sei.lpFile); + + if (!ShellExecuteExW( &sei )) + { HeapFree(GetProcessHeap(), 0, psz); - HeapFree(GetProcessHeap(), 0, pdir); + HeapFree(GetProcessHeap(), 0, parent); SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; return TRUE ; - } - FillList (htxt, psz) ; + } + + /* FillList is still ANSI */ + GetWindowTextA (htxt, (LPSTR)psz, ic + 1) ; + FillList (htxt, (LPSTR)psz, FALSE) ; + HeapFree(GetProcessHeap(), 0, psz); - HeapFree(GetProcessHeap(), 0, pdir); - EndDialog (hwnd, 0) ; + HeapFree(GetProcessHeap(), 0, parent); + EndDialog (hwnd, 0); } } @@ -378,55 +438,43 @@ EndDialog (hwnd, 0) ; return TRUE ; - case 12288 : + case IDC_RUNDLG_BROWSE : { HMODULE hComdlg = NULL ; LPFNOFN ofnProc = NULL ; - static char szFName[1024] = "", szFileTitle[256] = "", szInitDir[768] = "" ; - static OPENFILENAMEA ofn = - { - sizeof (OPENFILENAMEA), - NULL, - NULL, - "Executable Files\0*.exe\0All Files\0*.*\0\0\0\0", - NULL, - 0, - 0, - szFName, - 1023, - szFileTitle, - 255, - (LPCSTR)szInitDir, - "Browse", - OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST, - 0, - 0, - NULL, - 0, - (LPOFNHOOKPROC)NULL, - NULL - } ; - - ofn.hwndOwner = hwnd ; - - if (NULL == (hComdlg = LoadLibraryExA ("comdlg32", NULL, 0))) - { - MessageBoxA (hwnd, "Unable to display dialog box (LoadLibraryEx) !", "Nix", MB_OK | MB_ICONEXCLAMATION) ; + static const WCHAR comdlg32W[] = {'c','o','m','d','l','g','3','2',0}; + WCHAR szFName[1024] = {0}; + WCHAR filter[MAX_PATH], szCaption[MAX_PATH]; + OPENFILENAMEW ofn; + + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER, filter, MAX_PATH); + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); + + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.hwndOwner = hwnd; + ofn.lpstrFilter = filter; + ofn.lpstrFile = szFName; + ofn.nMaxFile = 1023; + ofn.lpstrTitle = szCaption; + ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; + ofn.lpstrInitialDir = prfdp->lpstrDirectory; + + if (NULL == (hComdlg = LoadLibraryExW (comdlg32W, NULL, 0)) || + NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameW"))) + { + ERR("Couldn't get GetOpenFileName function entry (lib=%p, proc=%p)\n", hComdlg, ofnProc); + ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_RUNDLG_BROWSE_ERROR), NULL, MB_OK | MB_ICONERROR); return TRUE ; - } - - if ((LPFNOFN)NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameA"))) - { - MessageBoxA (hwnd, "Unable to display dialog box (GetProcAddress) !", "Nix", MB_OK | MB_ICONEXCLAMATION) ; - return TRUE ; - } - - ofnProc (&ofn) ; - - SetFocus (GetDlgItem (hwnd, IDOK)) ; - SetWindowTextA (GetDlgItem (hwnd, 12298), szFName) ; - SendMessageA (GetDlgItem (hwnd, 12298), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - SetFocus (GetDlgItem (hwnd, IDOK)) ; + } + + if (ofnProc(&ofn)) + { + SetFocus (GetDlgItem (hwnd, IDOK)) ; + SetWindowTextW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName) ; + SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; + SetFocus (GetDlgItem (hwnd, IDOK)) ; + } FreeLibrary (hComdlg) ; @@ -439,7 +487,8 @@ } /* This grabs the MRU list from the registry and fills the combo for the "Run" dialog above */ -static void FillList (HWND hCb, char *pszLatest) +/* fShowDefault ignored if pszLatest != NULL */ +static void FillList (HWND hCb, char *pszLatest, BOOL fShowDefault) { HKEY hkey ; /* char szDbgMsg[256] = "" ; */ @@ -511,7 +560,7 @@ MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; */ SendMessageA (hCb, CB_ADDSTRING, 0, (LPARAM)pszCmd) ; - if (!Nix) + if (!Nix && fShowDefault) { SetWindowTextA (hCb, pszCmd) ; SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; @@ -609,6 +658,7 @@ return 0; } + /************************************************************************* * LogoffWindowsDialog [SHELL32.54] */ @@ -621,6 +671,7 @@ } return 0; } + /************************************************************************* * RestartDialog [SHELL32.59] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -668,6 +668,12 @@ IDS_SHUTDOWN_PROMPT "Èñêàòå ëè äà èçêëþ÷èòå êîìïþòúðà?" IDS_LOGOFF_TITLE "Èçëèçàíå" IDS_LOGOFF_PROMPT "Èñêàòå ëè äà èçëåçåòå?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" // shell folder path default values IDS_PROGRAMS "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ" @@ -718,8 +724,8 @@ IDS_RECYCLEBIN_DISKSPACE "Ñâîáîäíî ìÿñòî" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Èçáåðåòå çíà÷å" - IDS_PICK_ICON_FILTER "Ôàéëîâå ñúñ çíà÷åòà(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Èçïúëíèìè ôàéëîâå\0*.exe\0" + IDS_PICK_ICON_FILTER "Ôàéëîâå ñúñ çíà÷åòà (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Èçïúëíèìè ôàéëîâå (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Âîäà÷ íà ïðèâèäíî óñòðîéñòâî" IDS_BAT_FILE "Ïàêåòåí ôàéë íà ÐåàêòÎÑ" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -654,6 +654,12 @@ IDS_SHUTDOWN_PROMPT "Opravdu chcete vypnout poèítaè?" IDS_LOGOFF_TITLE "Odhlásit se" IDS_LOGOFF_PROMPT "Opravdu se chcete odhlásit?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Nabídka Start\\Programy" @@ -704,8 +710,8 @@ IDS_RECYCLEBIN_DISKSPACE "Dostupné místo" IDS_EMPTY_BITBUCKET "Vysypat ko" IDS_PICK_ICON_TITLE "Zvolit ikonu" - IDS_PICK_ICON_FILTER "Soubory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Spustitelné soubory\0*.exe\0" + IDS_PICK_ICON_FILTER "Soubory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Spustitelné soubory (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Sloka" IDS_VIRTUAL_DRIVER "Virtuální ovladaè zaøízení" IDS_BAT_FILE "ReactOS dávkový soubor" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -656,6 +656,12 @@ IDS_SHUTDOWN_PROMPT "Ønsker du at Lukke Ned?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programmer" @@ -706,8 +712,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -671,6 +671,12 @@ IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" IDS_LOGOFF_TITLE "Ausloggen" IDS_LOGOFF_PROMPT "Möchten Sie sich ausloggen?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Startmenü\\Programme" @@ -721,8 +727,8 @@ IDS_RECYCLEBIN_DISKSPACE "freier Speicher" IDS_EMPTY_BITBUCKET "Papierkorb leeren" IDS_PICK_ICON_TITLE "Symbol auswählen" - IDS_PICK_ICON_FILTER "Symboldateien(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Programme\0*.exe\0" + IDS_PICK_ICON_FILTER "Symboldateien (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Programme (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Dateiordner" IDS_VIRTUAL_DRIVER "Virtueller Gerätetreiber" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -668,6 +668,12 @@ IDS_SHUTDOWN_PROMPT "Åßóôå óßãïõñïé üôé èÝëåôå íá áðåíåñãïðïéÞóåôå ôïí õðïëïãéóôÞ óáò;" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -718,8 +724,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -678,6 +678,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -728,8 +734,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -680,6 +680,12 @@ IDS_SHUTDOWN_PROMPT "¿Desea apagar el equipo?" IDS_LOGOFF_TITLE "Cerrar sesión" IDS_LOGOFF_PROMPT "¿Desea cerrar la sesión?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menú Inicio\\Programas" @@ -730,8 +736,8 @@ IDS_RECYCLEBIN_DISKSPACE "Espacio disponible" IDS_EMPTY_BITBUCKET "Vaciar Papelera de reciclaje" IDS_PICK_ICON_TITLE "Seleccione un icono" - IDS_PICK_ICON_FILTER "Archivos de iconos(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Programas\0*.exe\0" + IDS_PICK_ICON_FILTER "Archivos de iconos (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Programas (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Directorio" IDS_VIRTUAL_DRIVER "Controlador de dispositivo virtual" IDS_BAT_FILE "Archivo por lotes ReactOS" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Käynnistä\\Ohjelmat" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -671,6 +671,12 @@ IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?" IDS_LOGOFF_TITLE "Se déconnecter" IDS_LOGOFF_PROMPT "Voulez-vous vous déconnecter ?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Démarrer\\Programmes" @@ -721,8 +727,8 @@ IDS_RECYCLEBIN_DISKSPACE "Espace disponible" IDS_EMPTY_BITBUCKET "Vider la Corbeille" IDS_PICK_ICON_TITLE "Choisir une icône" - IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Fichiers exécutables\0*.exe\0" + IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Fichiers exécutables (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Dossier" IDS_VIRTUAL_DRIVER "Pilote de périphérique virtuel" IDS_BAT_FILE "Fichier Batch ReactOS" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "Kiakarod kapcsolni számítógépét?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -720,8 +726,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -678,6 +678,12 @@ IDS_SHUTDOWN_PROMPT "Volete arrestare il sistema?" IDS_LOGOFF_TITLE "Disconnetti" IDS_LOGOFF_PROMPT "Volete disconnettervi?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Avvio\\Programmi" @@ -728,8 +734,8 @@ IDS_RECYCLEBIN_DISKSPACE "Spazio disponibile" IDS_EMPTY_BITBUCKET "Svuota cestino" IDS_PICK_ICON_TITLE "Scegliere un icona" - IDS_PICK_ICON_FILTER "Icone(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "File eseguibili\0*.exe\0" + IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Cartella" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Vbg_EµÜ·©?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "X^[g j[\\vO" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "pÅ«éÌæ" IDS_EMPTY_BITBUCKET "²Ý ðóÉ·é" IDS_PICK_ICON_TITLE "ACRÌIð" - IDS_PICK_ICON_FILTER "ACRt@C(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "ÀsÂ\\ t@C\0*.exe\0" + IDS_PICK_ICON_FILTER "ACRt@C (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "ÀsÂ\\ t@C (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "tH_" IDS_VIRTUAL_DRIVER "¼z foCX hCo" IDS_BAT_FILE "ReactOS ob` t@C" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "Vil du slå av datamaskinen?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start-meny\\Programmer" @@ -720,8 +726,8 @@ IDS_RECYCLEBIN_DISKSPACE "Ledig plass" IDS_EMPTY_BITBUCKET "Tøm papirkurven" IDS_PICK_ICON_TITLE "Velg Ikon" - IDS_PICK_ICON_FILTER "Ikon Fil(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Kjørbare filer\0*.exe\0" + IDS_PICK_ICON_FILTER "Ikon Fil (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Kjørbare filer (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Mappe" IDS_VIRTUAL_DRIVER "Virtuell enhetdriver" IDS_BAT_FILE "ReactOS Batch fil" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -674,6 +674,12 @@ IDS_SHUTDOWN_PROMPT "Czy chcesz wy³¹czyæ system?" IDS_LOGOFF_TITLE "Wyloguj" IDS_LOGOFF_PROMPT "Czy chcesz siê wylogowaæ z systemu?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Nie mogê wywietliæ okna Uruchom (b³¹d wewnêtrzny)" + IDS_RUNDLG_BROWSE_ERROR "Nie mogê wywietliæ okna Przegl¹daj (b³¹d wewnêtrzny)" + IDS_RUNDLG_BROWSE_CAPTION "Przegl¹daj" + IDS_RUNDLG_BROWSE_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Start\\Programy" @@ -724,8 +730,8 @@ IDS_RECYCLEBIN_DISKSPACE "Pozosta³o wolnego miejsca" IDS_EMPTY_BITBUCKET "Opró¿nij Kosz" IDS_PICK_ICON_TITLE "Wybierz ikonê" - IDS_PICK_ICON_FILTER "Pliki ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Programy\0*.exe\0" + IDS_PICK_ICON_FILTER "Pliki ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Wszystkie pliki (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" IDS_DIRECTORY "Katalog" IDS_VIRTUAL_DRIVER "Sterownik urz¹dzenia wirtualnego" IDS_BAT_FILE "Plik wsadowy ReactOS" @@ -759,5 +765,5 @@ IDS_DEFAULT_CLUSTER_SIZE "Domylny rozmiar jednostki alokacji" IDS_COPY_OF "Kopia" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowane by otwieraæ pliki tego typu." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -669,6 +669,12 @@ IDS_SHUTDOWN_PROMPT "Você quer finalizar a sessão no Wine?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" @@ -719,8 +725,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessão do ReactOS?" IDS_LOGOFF_TITLE "Terminar a sessão" IDS_LOGOFF_PROMPT "Pretende terminar a sessão?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" @@ -720,8 +726,8 @@ IDS_RECYCLEBIN_DISKSPACE "Espaço Disponível" IDS_EMPTY_BITBUCKET "Esvaziar Reciclagem" IDS_PICK_ICON_TITLE "Escolha Ícone" - IDS_PICK_ICON_FILTER "Ficheiros de Ícones(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Ficheiros Executáveis\0*.exe\0" + IDS_PICK_ICON_FILTER "Ficheiros de Ícones (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Ficheiros Executáveis (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Pasta" IDS_VIRTUAL_DRIVER "Driver de Dispositivo Virtual" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "VreÈi sÄ Ã®nchideÈi computerul?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Meniu Start\\Programe" @@ -720,8 +726,8 @@ IDS_RECYCLEBIN_DISKSPACE "SpaÈiu disponibil" IDS_EMPTY_BITBUCKET "Golire CoÈ de gunoi" IDS_PICK_ICON_TITLE "Alegere pictogramÄ" - IDS_PICK_ICON_FILTER "FiÈiere pictogramÄ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "FiÈiere executabile\0*.exe\0" + IDS_PICK_ICON_FILTER "FiÈiere pictogramÄ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "FiÈiere executabile (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Dosar" IDS_VIRTUAL_DRIVER "Driver dispozitiv virtual" IDS_BAT_FILE "FiÈier serie de comenzi ReactOS" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -666,6 +666,12 @@ IDS_SHUTDOWN_PROMPT "Çàêîí÷èòü ðàáîòó ñ ReactOS?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû" @@ -716,8 +722,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî" IDS_EMPTY_BITBUCKET "Î÷èñòèòü êîðçèíó" IDS_PICK_ICON_TITLE "Âûáðàòü çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû\0*.exe\0" + IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð âèðòóàëüíîãî óñòðîéñòâà" IDS_BAT_FILE "Ïàêåòíûé ôàéë ReactOS" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -673,6 +673,12 @@ IDS_SHUTDOWN_PROMPT "Naozaj chcete vypnú poèítaè?" IDS_LOGOFF_TITLE "Odhlási" IDS_LOGOFF_PROMPT "Naozaj sa chcete odhlási?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Ponuka tart\\Programy" @@ -723,8 +729,8 @@ IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto" IDS_EMPTY_BITBUCKET "Vyprázdni Kô" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Súbory ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Spustite¾né súbory\0*.exe\0" + IDS_PICK_ICON_FILTER "Súbory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Spustite¾né súbory (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Prieèinok" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "Dávkový súbor systému ReactOS" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programlar" @@ -717,8 +723,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -680,6 +680,12 @@ IDS_SHUTDOWN_PROMPT "Âè õî÷åòå âèìêíóòè êîìï'þòåð?" IDS_LOGOFF_TITLE "Âèõ³ä ç ñèñòåìè" IDS_LOGOFF_PROMPT "Âè õî÷åòå âèéòè ç ñèñòåìè?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -730,8 +736,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíèé ïðîñò³ð" IDS_EMPTY_BITBUCKET "Î÷èñòèòè Êîøèê" IDS_PICK_ICON_TITLE "Âèáðàòè çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè\0*.exe\0" + IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð â³ðòóàëüíîãî ïðèñòðîþ" IDS_BAT_FILE "Ïàêåòíèé ôàéë ReactOS" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -656,6 +656,12 @@ IDS_SHUTDOWN_PROMPT "ÊÇ·ñ¹Ø±ÕÏµÍ³?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -705,8 +711,8 @@ IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -668,6 +668,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -718,8 +724,8 @@ 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" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -537,8 +537,8 @@ void BrowseForApplication(HWND hwndDlg) { - WCHAR szBuffer[30] = {0}; - WCHAR szFilter[30] = {0}; + WCHAR szBuffer[64] = {0}; + WCHAR szFilter[256] = {0}; WCHAR szPath[MAX_PATH]; OPENFILENAMEW ofn; OPEN_WITH_CONTEXT Context; Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -58,9 +58,9 @@ 58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # Fixme 59 stdcall RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) # Fixme -61 stdcall -noname RunFileDlg(long long long str str long) RunFileDlg # Fixme +61 stdcall -noname RunFileDlg(long long long wstr wstr long) RunFileDlg # Fixme? 62 stdcall PickIconDlg(long long long long) -63 stdcall GetFileNameFromBrowse(long long long long str str str) +63 stdcall GetFileNameFromBrowse(long long long long wstr wstr wstr) 64 stdcall DriveType(long) 65 stdcall -noname InvalidateDriveType(long) 66 stdcall IsNetDrive(long) Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -142,6 +142,11 @@ #define IDS_FILE_TYPES 174 #define IDS_FILE_DETAILS 175 +#define IDS_RUNDLG_ERROR 180 +#define IDS_RUNDLG_BROWSE_ERROR 181 +#define IDS_RUNDLG_BROWSE_CAPTION 182 +#define IDS_RUNDLG_BROWSE_FILTER 183 + #define IDS_OPEN_VERB 300 #define IDS_RUNAS_VERB 301 #define IDS_EDIT_VERB 302 @@ -194,6 +199,13 @@ #define SHELL_EXTENDED_SHORTCUT_DLG 0x4000 #define OPEN_WITH_PROGRAMM_DLG 0x4001 #define IDD_SH_FILE_COPY 0x4002 + +/* run dialog */ +#define IDC_RUNDLG_DESCRIPTION 12289 +#define IDC_RUNDLG_BROWSE 12288 +#define IDC_RUNDLG_ICON 12297 +#define IDC_RUNDLG_EDITPATH 12298 +#define IDC_RUNDLG_LABEL 12305 /* ID's of the ShellAbout controls */ // Part 1 - ID's identical to Windows Server 2003 SP1's shell32.dll Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Wed Mar 23 16:22:38 2011 @@ -70,6 +70,15 @@ BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); + +/**************************************************************************** +* SHChangeNotifyRegister API +*/ +#define SHCNRF_InterruptLevel 0x0001 +#define SHCNRF_ShellLevel 0x0002 +#define SHCNRF_RecursiveInterrupt 0x1000 /* Must be combined with SHCNRF_InterruptLevel */ +#define SHCNRF_NewDelivery 0x8000 /* Messages use shared memory */ + /**************************************************************************** * Shell Common Dialogs */ @@ -100,9 +109,9 @@ void WINAPI RunFileDlg( HWND hwndOwner, HICON hIcon, - LPCSTR lpstrDirectory, - LPCSTR lpstrTitle, - LPCSTR lpstrDescription, + LPCWSTR lpstrDirectory, + LPCWSTR lpstrTitle, + LPCWSTR lpstrDescription, UINT uFlags); void WINAPI ExitWindowsDialog(HWND hwndOwner);

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