Author: gedmurphy
Date: Thu May 26 21:53:16 2011
New Revision: 51939
URL: http://svn.reactos.org/svn/reactos?rev=51939&view=rev
Log:
[SHELL32_NEW]
Merge 51602, 51604, 51701, 51702
Modified:
branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc
branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc
branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc
branches/shell32_new-bringup/dll/win32/shell32/shell32.spec
branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc?rev=51939&r1=51938&r2=51939&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1]
Thu May 26 21:53:16 2011
@@ -774,6 +774,6 @@
IDS_FILE_DETAILS "Detalles para el tipo de archivo '%s'"
IDS_FILE_DETAILSADV "Los archivos con extensión '%s' son del
tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en
Opciones avanzadas."
- IDS_FILE_TYPES "FileTypes"
- IDS_COLUMN_EXTENSION "Extensions"
-END
+ IDS_FILE_TYPES "Tipos de archivos"
+ IDS_COLUMN_EXTENSION "Extensiones"
+END
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc?rev=51939&r1=51938&r2=51939&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1]
Thu May 26 21:53:16 2011
@@ -772,6 +772,6 @@
IDS_FILE_DETAILS "Dettagli per l'estensione '%s'"
IDS_FILE_DETAILSADV "I files con estensione '%s' sono di tipo
'%s'. Per modificare le impostazioni per tutti i file '%s', cliccare su
Avanzate."
- IDS_FILE_TYPES "FileTypes"
- IDS_COLUMN_EXTENSION "Extensions"
-END
+ IDS_FILE_TYPES "Tipi di file"
+ IDS_COLUMN_EXTENSION "Estensioni"
+END
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc?rev=51939&r1=51938&r2=51939&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1]
Thu May 26 21:53:16 2011
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
* ReactOS shell32 fork translation updated by Caemyr -
- * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010)
+ * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010, May 2011)
* Use ReactOS forum PM or IRC to contact me
* http://www.reactos.org
* IRC: irc.freenode.net #reactos-pl;
@@ -769,6 +769,6 @@
IDS_FILE_DETAILS "Szczegó³y dla rozszerzenia '%s'"
IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' s¹ typu '%s'.
Aby zmieniæ ustawienia, które dotycz¹ wszystkich plików '%s', kliknij przycisk
Zaawansowane."
- IDS_FILE_TYPES "FileTypes"
- IDS_COLUMN_EXTENSION "Extensions"
-END
+ IDS_FILE_TYPES "Typy plików"
+ IDS_COLUMN_EXTENSION "Rozszerzenia"
+END
Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32.spec
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shell32.spec?rev=51939&r1=51938&r2=51939&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shell32.spec [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shell32.spec [iso-8859-1]
Thu May 26 21:53:16 2011
@@ -113,16 +113,16 @@
113 stdcall Control_RunDLLA(ptr ptr str long)
114 stdcall Control_RunDLLAsUserW(ptr ptr wstr long)
115 stdcall Control_RunDLLW(ptr ptr wstr long)
-116 stdcall DllCanUnloadNow()
-117 stdcall DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
118 stdcall DllGetVersion(ptr)
119 stdcall IsLFNDrive(ptr) IsLFNDriveAW
-120 stdcall DllInstall(long wstr)
+@ stdcall -private DllInstall(long wstr)
121 stdcall SHFlushClipboard()
122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name
wrong?
123 stdcall -noname SHFreeUnusedLibraries()
-124 stdcall DllRegisterServer()
-125 stdcall DllUnregisterServer()
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme
127 stdcall -noname SHWinHelp(long long long long)
128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject
@@ -316,7 +316,7 @@
316 stdcall SHGetSpecialFolderLocation(long long ptr)
317 stdcall SHGetSpecialFolderPathA(long ptr long long)
318 stdcall SHGetSpecialFolderPathW(long ptr long long)
-319 stdcall SHGetUnreadMailCountW(long wstr long ptr wstr long)
+319 stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long)
320 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA
321 stdcall SHHelpShortcuts_RunDLLA(long long long long)
322 stdcall SHHelpShortcuts_RunDLLW(long long long long)
@@ -332,7 +332,7 @@
332 stdcall SHQueryRecycleBinA(str ptr)
333 stdcall SHQueryRecycleBinW(wstr ptr)
334 stdcall SHSetLocalizedName(wstr wstr long)
-335 stdcall SHSetUnreadMailCountW(wstr long wstr)
+335 stdcall SHSetUnreadMailCountW (wstr long wstr)
336 stdcall SHUpdateRecycleBinIcon()
337 stdcall SheChangeDirA(str)
338 stdcall SheChangeDirExA(str)
Modified: branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp?rev=51939&r1=51938&r2=51939&view=diff
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1]
Thu May 26 21:53:16 2011
@@ -102,9 +102,13 @@
/* strdup on the process heap */
static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str)
{
+ INT len;
+ LPWSTR p;
+
assert(str);
- INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 );
- LPWSTR p = (LPWSTR)HeapAlloc( heap, flags, len*sizeof (WCHAR) );
+
+ len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 );
+ p = (LPWSTR)HeapAlloc( heap, flags, len*sizeof (WCHAR) );
if( !p )
return p;
MultiByteToWideChar( CP_ACP, 0, str, -1, p, len );
