Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[tkreuzer] 35695: Merge 34717 from ros-amd64-bringup branch: - Fix prototypes of _findfirst, _findnext, _findclose, _findfirsti64, _findnexti64 _wfindfirst, _wfindnext, _wfindfirst64, _wfindnext64, strndup, - Fix a number of pointer to int casts
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Tue Aug 26 22:59:24 2008 New Revision: 35695 URL: http://svn.reactos.org/svn/reactos?rev=35695&view=rev Log: Merge 34717 from ros-amd64-bringup branch: - Fix prototypes of _findfirst, _findnext, _findclose, _findfirsti64, _findnexti64 _wfindfirst, _wfindnext, _wfindfirst64, _wfindnext64, strndup, - Fix a number of pointer to int casts Modified: trunk/reactos/include/crt/io.h trunk/reactos/include/reactos/wine/library.h trunk/reactos/lib/3rdparty/mingw/gccmain.c trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c trunk/reactos/lib/sdk/crt/misc/getargs.c trunk/reactos/lib/sdk/crt/search/lfind.c trunk/reactos/lib/sdk/crt/search/lsearch.c trunk/reactos/lib/sdk/crt/stdio/find.c Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=35695… ============================================================================== --- trunk/reactos/include/crt/io.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/io.h [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -129,10 +129,10 @@ * _findclose calls. _findnext also returns -1 if no match could be found, * and 0 if a match was found. Call _findclose when you are finished. */ -/* FIXME: Should these all use intptr_t, as per recent MSDN docs? */ -_CRTIMP long __cdecl __MINGW_NOTHROW _findfirst (const char*, struct _finddata_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _findnext (long, struct _finddata_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _findclose (long); + +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirst (const char*, struct _finddata_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findnext (intptr_t, struct _finddata_t*); +_CRTIMP int __cdecl __MINGW_NOTHROW _findclose (intptr_t); _CRTIMP int __cdecl __MINGW_NOTHROW _chdir (const char*); _CRTIMP char* __cdecl __MINGW_NOTHROW _getcwd (char*, int); @@ -143,8 +143,8 @@ #ifdef __MSVCRT__ _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int); -_CRTIMP long __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _findnexti64(long, struct _finddatai64_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*); +_CRTIMP int __cdecl __MINGW_NOTHROW _findnexti64(intptr_t, struct _finddatai64_t*); _CRTIMP __int64 __cdecl __MINGW_NOTHROW _lseeki64(int, __int64, int); _CRTIMP __int64 __cdecl __MINGW_NOTHROW _telli64(int); /* These require newer versions of msvcrt.dll (6.1 or higher). */ @@ -259,14 +259,14 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int); _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int); _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int); -_CRTIMP long __cdecl __MINGW_NOTHROW _wfindfirst(const wchar_t*, struct _wfinddata_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnext(long, struct _wfinddata_t *); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst(const wchar_t*, struct _wfinddata_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindnext(intptr_t, struct _wfinddata_t *); _CRTIMP int __cdecl __MINGW_NOTHROW _wunlink(const wchar_t*); _CRTIMP int __cdecl __MINGW_NOTHROW _wopen(const wchar_t*, int, ...); _CRTIMP int __cdecl __MINGW_NOTHROW _wsopen(const wchar_t*, int, int, ...); _CRTIMP wchar_t * __cdecl __MINGW_NOTHROW _wmktemp(wchar_t*); -_CRTIMP long __cdecl __MINGW_NOTHROW _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnexti64(long, struct _wfinddatai64_t*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); +_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnexti64(intptr_t, struct _wfinddatai64_t*); #if __MSVCRT_VERSION__ >= 0x0601 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst64(const wchar_t*, struct __wfinddata64_t*); _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindnext64(intptr_t, struct __wfinddata64_t*); Modified: trunk/reactos/include/reactos/wine/library.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/libra… ============================================================================== --- trunk/reactos/include/reactos/wine/library.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/library.h [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -23,6 +23,7 @@ #include <stdarg.h> #include <sys/types.h> +#include <stdint.h> #include <windef.h> #include <winbase.h> @@ -131,9 +132,9 @@ /* helper functions to manipulate the LDT_ENTRY structure */ inline static void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) { - ent->BaseLow = (WORD)(unsigned long)base; - ent->HighWord.Bits.BaseMid = (BYTE)((unsigned long)base >> 16); - ent->HighWord.Bits.BaseHi = (BYTE)((unsigned long)base >> 24); + ent->BaseLow = (WORD)(intptr_t)base; + ent->HighWord.Bits.BaseMid = (BYTE)((intptr_t)base >> 16); + ent->HighWord.Bits.BaseHi = (BYTE)((intptr_t)base >> 24); } inline static void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) { @@ -144,8 +145,8 @@ inline static void *wine_ldt_get_base( const LDT_ENTRY *ent ) { return (void *)(ent->BaseLow | - (unsigned long)ent->HighWord.Bits.BaseMid << 16 | - (unsigned long)ent->HighWord.Bits.BaseHi << 24); + (intptr_t)ent->HighWord.Bits.BaseMid << 16 | + (intptr_t)ent->HighWord.Bits.BaseHi << 24); } inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) { Modified: trunk/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gccmain… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -13,6 +13,7 @@ /* Needed for the atexit prototype. */ #include <stdlib.h> +#include <stddef.h> typedef void (*func_ptr) (void); extern func_ptr __CTOR_LIST__[]; @@ -37,8 +38,8 @@ void __do_global_ctors (void) { - unsigned long nptrs = (unsigned long) __CTOR_LIST__[0]; - unsigned i; + unsigned long nptrs = (unsigned long) (ptrdiff_t) __CTOR_LIST__[0]; + unsigned long i; /* * If the first entry in the constructor list is -1 then the list @@ -47,8 +48,7 @@ */ if (nptrs == -1) { - for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++) - ; + for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++); } /* @@ -77,3 +77,4 @@ } } + Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -28,12 +28,12 @@ static void do_pseudo_reloc (void* start, void* end, void* base) { - DWORD reloc_target; + ptrdiff_t reloc_target; runtime_pseudo_reloc* r; for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++) { - reloc_target = (DWORD) base + r->target; - *((DWORD*) reloc_target) += r->addend; + reloc_target = (ptrdiff_t) base + r->target; + *((ptrdiff_t*) reloc_target) += r->addend; } } Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -24,7 +24,7 @@ extern HANDLE hHeap; -char* strndup(char* name, int len) +char* strndup(char* name, size_t len) { char *s = malloc(len + 1); if (s != NULL) @@ -35,7 +35,7 @@ return s; } -wchar_t* wcsndup(wchar_t* name, int len) +wchar_t* wcsndup(wchar_t* name, size_t len) { wchar_t *s = malloc((len + 1) * sizeof(wchar_t)); if (s != NULL) @@ -362,3 +362,4 @@ return &__wargv; } + Modified: trunk/reactos/lib/sdk/crt/search/lfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lfind.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -1,12 +1,11 @@ +#include <stdlib.h> #include <search.h> -#include <stdlib.h> - /* * @implemented */ -void *_lfind(const void *key, const void *base, size_t *nelp, - size_t width, int (*compar)(const void *, const void *)) +void *_lfind(const void *key, const void *base, unsigned int *nelp, + unsigned int width, int (*compar)(const void *, const void *)) { char* char_base = (char*)base; unsigned int i; @@ -19,3 +18,4 @@ return NULL; } + Modified: trunk/reactos/lib/sdk/crt/search/lsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lsearch… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -1,11 +1,11 @@ -#include <search.h> #include <stdlib.h> #include <string.h> +#include <search.h> /* * @implemented */ -void *_lsearch(const void *key, void *base, size_t *nelp, size_t width, +void *_lsearch(const void *key, void *base, unsigned int *nelp, unsigned int width, int (*compar)(const void *, const void *)) { void *ret_find = _lfind(key,base,nelp,width,compar); @@ -19,3 +19,4 @@ return base; } + Modified: trunk/reactos/lib/sdk/crt/stdio/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/find.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/find.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/find.c [iso-8859-1] Tue Aug 26 22:59:24 2008 @@ -4,17 +4,13 @@ /* * @implemented */ -#if defined(_UNICODE) || !(__MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3) -long -#else -int -#endif +intptr_t _tfindfirst(const _TCHAR* _name, struct _tfinddata_t* result) { WIN32_FIND_DATA FindFileData; long hFindFile; - hFindFile = (long)FindFirstFile(_name, &FindFileData); + hFindFile = (intptr_t)FindFirstFile(_name, &FindFileData); if (hFindFile == -1) { _dosmaperr(GetLastError()); return -1; @@ -33,13 +29,7 @@ /* * @implemented */ -int _tfindnext( -#if defined(_UNICODE) || !(__MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3) - long handle, -#else - int handle, -#endif - struct _tfinddata_t* result) +intptr_t _tfindnext(intptr_t handle, struct _tfinddata_t* result) { WIN32_FIND_DATA FindFileData; @@ -62,12 +52,12 @@ /* * @implemented */ -long _tfindfirsti64(const _TCHAR *_name, struct _tfinddatai64_t *result) +intptr_t _tfindfirsti64(const _TCHAR *_name, struct _tfinddatai64_t *result) { WIN32_FIND_DATA FindFileData; long hFindFile; - hFindFile = (long)FindFirstFile(_name, &FindFileData); + hFindFile = (intptr_t)FindFirstFile(_name, &FindFileData); if (hFindFile == -1) { _dosmaperr(GetLastError()); @@ -85,14 +75,10 @@ return hFindFile; } -//_CRTIMP long __cdecl _findfirsti64(const char*, struct _finddatai64_t*); -//_CRTIMP int __cdecl _findnexti64(long, struct _finddatai64_t*); - - /* * @implemented */ -int _tfindnexti64(long handle, struct _tfinddatai64_t *result) +int _tfindnexti64(intptr_t handle, struct _tfinddatai64_t *result) { WIN32_FIND_DATA FindFileData; @@ -119,15 +105,9 @@ /* * @implemented */ -int _findclose( -#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3 - int handle -#else - long handle -#endif - ) +int _findclose(intptr_t handle) { - if (!FindClose((void*)handle)) { + if (!FindClose((HANDLE)handle)) { _dosmaperr(GetLastError()); return -1; }

1 0

[tkreuzer] 35694: Add Cch functions to strsafe lib.
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Tue Aug 26 22:03:39 2008 New Revision: 35694 URL: http://svn.reactos.org/svn/reactos?rev=35694&view=rev Log: Add Cch functions to strsafe lib. Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfW.c (with props) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatA _StringCchCatA +#include <strsafe.h> + +#undef StringCchCatA +HRESULT __stdcall +StringCchCatA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCchCatA(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatExA _StringCchCatExA +#include <strsafe.h> + +#undef StringCchCatExA +HRESULT __stdcall +StringCchCatExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCchCatExA(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatExW _StringCchCatExW +#include <strsafe.h> + +#undef StringCchCatExW +HRESULT __stdcall +StringCchCatExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCchCatExW(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatNA _StringCchCatNA +#include <strsafe.h> + +#undef StringCchCatNA +HRESULT __stdcall +StringCbCatNA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbMaxAppend) +{ + /* Use the inlined version */ + return _StringCchCatNA(pszDest, cbDest, pszSrc, cbMaxAppend); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatNExA _StringCchCatNExA +#include <strsafe.h> + +#undef StringCchCatNExA +HRESULT __stdcall +StringCchCatNExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCchCatNExA(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatNExW _StringCchCatNExW +#include <strsafe.h> + +#undef StringCchCatNExW +HRESULT __stdcall +StringCchCatNExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCchCatNExW(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatNW _StringCchCatNW +#include <strsafe.h> + +#undef StringCchCatNW +HRESULT __stdcall +StringCchCatNW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbMaxAppend) +{ + /* Use the inlined version */ + return _StringCchCatNW(pszDest, cbDest, pszSrc, cbMaxAppend); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatNW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCatW _StringCchCatW +#include <strsafe.h> + +#undef StringCchCatW +HRESULT __stdcall +StringCchCatW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCchCatW(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCatW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyA _StringCchCopyA +#include <strsafe.h> + +#undef StringCchCopyA +HRESULT __stdcall +StringCbCopyA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCchCopyA(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,17 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyExA _StringCchCopyExA +#include <strsafe.h> + +#undef StringCchCopyExA +HRESULT __stdcall +StringCchCopyExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) +{ + /* Use the inlined version */ + return _StringCchCopyExA(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyExW _StringCchCopyExW +#include <strsafe.h> + +#undef StringCchCopyExW +HRESULT __stdcall +StringCchCopyExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCchCopyExW(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyNA _StringCchCopyNA +#include <strsafe.h> + +#undef StringCchCopyNA +HRESULT __stdcall +StringCchCopyNA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbSrc) +{ + /* Use the inlined version */ + return _StringCchCopyNA(pszDest, cbDest, pszSrc, cbSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyNExA _StringCchCopyNExA +#include <strsafe.h> + +#undef StringCchCopyNExA +HRESULT __stdcall +StringCchCopyNExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCchCopyNExA(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyNExW _StringCchCopyNExW +#include <strsafe.h> + +#undef StringCchCopyNExW +HRESULT __stdcall +StringCchCopyNExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCchCopyNExW(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyNW _StringCchCopyNW +#include <strsafe.h> + +#undef StringCchCopyNW +HRESULT __stdcall +StringCchCopyNW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbSrc) +{ + /* Use the inlined version */ + return _StringCchCopyNW(pszDest, cbDest, pszSrc, cbSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyNW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchCopyW _StringCchCopyW +#include <strsafe.h> + +#undef StringCchCopyW +HRESULT __stdcall +StringCchCopyW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCchCopyW(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchCopyW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,13 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchGetsA _StringCchGetsA +#include <strsafe.h> + +#undef StringCchGetsA +HRESULT __stdcall +StringCchGetsA( + STRSAFE_LPSTR pszDest, + size_t cbDest) +{ + /* Use the inlined version */ + return _StringCchGetsA(pszDest, cbDest); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,16 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchGetsExA _StringCchGetsExA +#include <strsafe.h> + +#undef StringCchGetsExA +HRESULT __stdcall +StringCchGetsExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) +{ + /* Use the inlined version */ + return _StringCchGetsExA(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,16 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchGetsExW _StringCchGetsExW +#include <strsafe.h> + +#undef StringCchGetsExW +HRESULT __stdcall +StringCchGetsExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) +{ + /* Use the inlined version */ + return _StringCchGetsExW(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,13 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchGetsW _StringCchGetsW +#include <strsafe.h> + +#undef StringCchGetsW +HRESULT __stdcall +StringCchGetsW( + STRSAFE_LPWSTR pszDest, + size_t cbDest) +{ + /* Use the inlined version */ + return _StringCchGetsW(pszDest, cbDest); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchGetsW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchLengthA _StringCchLengthA +#include <strsafe.h> + +#undef StringCchLengthA +HRESULT __stdcall +StringCchLengthA( + STRSAFE_LPCSTR psz, + size_t cbMax, + size_t *pcb) +{ + /* Use the inlined version */ + return _StringCchLengthA(psz, cbMax, pcb); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchLengthW _StringCchLengthW +#include <strsafe.h> + +#undef StringCchLengthW +HRESULT __stdcall +StringCchLengthW( + STRSAFE_LPCWSTR psz, + size_t cbMax, + size_t *pcb) +{ + /* Use the inlined version */ + return _StringCchLengthW(psz, cbMax, pcb); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchLengthW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchPrintfA _StringCchPrintfA +#include <strsafe.h> + +#undef StringCchPrintfA +HRESULT __stdcall +StringCchPrintfA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCchVPrintfA(pszDest, cbDest, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,22 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchPrintfExA _StringCchPrintfExA +#include <strsafe.h> + +#undef StringCchPrintfExA +HRESULT __stdcall +StringCchPrintfExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCchVPrintfExA(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,22 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchPrintfExW _StringCchPrintfExW +#include <strsafe.h> + +#undef StringCchPrintfExW +HRESULT __stdcall +StringCchPrintfExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCchVPrintfExW(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchPrintfW _StringCchPrintfW +#include <strsafe.h> + +#undef StringCchPrintfW +HRESULT __stdcall +StringCchPrintfW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCchVPrintfW(pszDest, cbDest, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchPrintfW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchVPrintfA _StringCchVPrintfA +#include <strsafe.h> + +#undef StringCchVPrintfA +HRESULT __stdcall +StringCchVPrintfA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCchVPrintfA(pszDest, cbDest, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExA.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchVPrintfExA _StringCchVPrintfExA +#include <strsafe.h> + +#undef StringCchVPrintfExA +HRESULT __stdcall +StringCchVPrintfExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCchVPrintfExA(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchVPrintfExW _StringCchVPrintfExW +#include <strsafe.h> + +#undef StringCchVPrintfExW +HRESULT __stdcall +StringCchVPrintfExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCchVPrintfExW(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfW.c [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CB_FUNCTIONS +#define StringCchVPrintfW _StringCchVPrintfW +#include <strsafe.h> + +#undef StringCchVPrintfW +HRESULT __stdcall +StringCchVPrintfW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCchVPrintfW(pszDest, cbDest, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCchVPrintfW.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild [iso-8859-1] Tue Aug 26 22:03:39 2008 @@ -32,4 +32,34 @@ <file>StringCbVPrintfW.c</file> <file>StringCbVPrintfExA.c</file> <file>StringCbVPrintfExW.c</file> + <file>StringCchCatA.c</file> + <file>StringCchCatW.c</file> + <file>StringCchCatExA.c</file> + <file>StringCchCatExW.c</file> + <file>StringCchCatNA.c</file> + <file>StringCchCatNW.c</file> + <file>StringCchCatNExA.c</file> + <file>StringCchCatNExW.c</file> + <file>StringCchCopyA.c</file> + <file>StringCchCopyW.c</file> + <file>StringCchCopyExA.c</file> + <file>StringCchCopyExW.c</file> + <file>StringCchCopyNA.c</file> + <file>StringCchCopyNW.c</file> + <file>StringCchCopyNExA.c</file> + <file>StringCchCopyNExW.c</file> + <file>StringCchGetsA.c</file> + <file>StringCchGetsW.c</file> + <file>StringCchGetsExA.c</file> + <file>StringCchGetsExW.c</file> + <file>StringCchLengthA.c</file> + <file>StringCchLengthW.c</file> + <file>StringCchPrintfA.c</file> + <file>StringCchPrintfW.c</file> + <file>StringCchPrintfExA.c</file> + <file>StringCchPrintfExW.c</file> + <file>StringCchVPrintfA.c</file> + <file>StringCchVPrintfW.c</file> + <file>StringCchVPrintfExA.c</file> + <file>StringCchVPrintfExW.c</file> </module>

1 0

[tkreuzer] 35693: More fixes in strsafe.h
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Tue Aug 26 22:01:25 2008 New Revision: 35693 URL: http://svn.reactos.org/svn/reactos?rev=35693&view=rev Log: More fixes in strsafe.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Tue Aug 26 22:01:25 2008 @@ -218,8 +218,6 @@ /* Create inlined versions */ #define STRSAFEAPI HRESULT static __inline__ -#ifndef STRSAFE_NO_CB_FUNCTIONS - STRSAFEAPI StringCxxCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc) { return 0; // FIXME @@ -325,12 +323,6 @@ va_end(args); return result; } - -#endif // !STRSAFE_NO_CB_FUNCTIONS - -#ifndef STRSAFE_NO_CCH_FUNCTIONS - -#endif // !STRSAFE_NO_CCH_FUNCTIONS #endif // !STRSAFE_LIB

1 0

[tkreuzer] 35692: Fix some strsafe.h definitions.
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Tue Aug 26 21:08:24 2008 New Revision: 35692 URL: http://svn.reactos.org/svn/reactos?rev=35692&view=rev Log: Fix some strsafe.h definitions. Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Tue Aug 26 21:08:24 2008 @@ -28,6 +28,7 @@ #define STRSAFE_PASS2 /* Implement Cb functions for ansi and unicode */ +#ifndef STRSAFE_NO_CB_FUNCTIONS #define STRSAFE_CB #define STRSAFE_UNICODE 0 # include <strsafe.h> @@ -36,14 +37,17 @@ # include <strsafe.h> #undef STRSAFE_UNICODE #undef STRSAFE_CB +#endif // !STRSAFE_NO_CB_FUNCTIONS /* Implement Cch functions for ansi and unicode */ +#ifndef STRSAFE_NO_CCH_FUNCTIONS #define STRSAFE_UNICODE 0 # include <strsafe.h> #undef STRSAFE_UNICODE #define STRSAFE_UNICODE 1 # include <strsafe.h> #undef STRSAFE_UNICODE +#endif // !STRSAFE_NO_CCH_FUNCTIONS #undef STRSAFE_PASS2 @@ -193,28 +197,21 @@ /* Normal function prototypes only */ #define STRSAFEAPI HRESULT __stdcall -#ifndef STRSAFE_NO_CB_FUNCTIONS -STRSAFEAPI StringCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc); -STRSAFEAPI StringCatEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); -STRSAFEAPI StringCatN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend); -STRSAFEAPI StringCatNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); -STRSAFEAPI StringCopy(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc); -STRSAFEAPI StringCopyEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); -STRSAFEAPI StringCopyN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc); -STRSAFEAPI StringCopyNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); -STRSAFEAPI StringGets(STRSAFE_LPTSTR pszDest, size_t cxDest); -STRSAFEAPI StringGetsEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); -STRSAFEAPI StringLength(STRSAFE_LPCTSTR psz, size_t cxMax, size_t *pcb); -STRSAFEAPI StringPrintf(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszFormat, ...); -STRSAFEAPI StringPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCTSTR pszFormat, ...); -STRSAFEAPI StringVPrintf(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszFormat, va_list args); -STRSAFEAPI StringVPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, LPCTSTR pszFormat, va_list args); -#endif // !STRSAFE_NO_CB_FUNCTIONS - -#ifndef STRSAFE_NO_CCH_FUNCTIONS - -#endif // !STRSAFE_NO_CCH_FUNCTIONS - +STRSAFEAPI StringCxxCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc); +STRSAFEAPI StringCxxCatEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCxxCatN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend); +STRSAFEAPI StringCxxCatNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCxxCopy(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc); +STRSAFEAPI StringCxxCopyEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCxxCopyN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc); +STRSAFEAPI StringCxxCopyNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCxxGets(STRSAFE_LPTSTR pszDest, size_t cxDest); +STRSAFEAPI StringCxxGetsEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCxxLength(STRSAFE_LPCTSTR psz, size_t cxMax, size_t *pcb); +STRSAFEAPI StringCxxPrintf(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszFormat, ...); +STRSAFEAPI StringCxxPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCTSTR pszFormat, ...); +STRSAFEAPI StringCxxVPrintf(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszFormat, va_list args); +STRSAFEAPI StringCxxVPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, LPCTSTR pszFormat, va_list args); #else // !STRSAFE_LIB

1 0

[tkreuzer] 35691: Optimize and shorten StringCxxLength
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Tue Aug 26 20:47:34 2008 New Revision: 35691 URL: http://svn.reactos.org/svn/reactos?rev=35691&view=rev Log: Optimize and shorten StringCxxLength Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Tue Aug 26 20:47:34 2008 @@ -286,11 +286,7 @@ return STRSAFE_E_INVALID_PARAMETER; } - while (*psz != 0 && cch != 0) - { - cch--; - psz++; - } + for (--psz; *(++psz) != 0 && --cch > 0;); if (cch == 0) {

1 0

[tkreuzer] 35690: - Rework defines in strsafe a bit. - Implement StringCxxLength()
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Tue Aug 26 19:40:10 2008 New Revision: 35690 URL: http://svn.reactos.org/svn/reactos?rev=35690&view=rev Log: - Rework defines in strsafe a bit. - Implement StringCxxLength() Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Tue Aug 26 19:40:10 2008 @@ -8,6 +8,11 @@ #error Both STRSAFE_NO_CCH_FUNCTIONS and STRSAFE_NO_CB_FUNCTIONS are defined #endif +#define STRSAFE_MAX_CCH 2147483647 +#define STRSAFE_E_INVALID_PARAMETER ((HRESULT)0x80070057L) +#ifndef S_OK +#define S_OK ((HRESULT)0x00000000L) +#endif #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED @@ -24,35 +29,43 @@ /* Implement Cb functions for ansi and unicode */ #define STRSAFE_CB -#define STRSAFE_CXX_CB(x) -#define STRSAFE_CXX_CCH(x) x *= sizeof(STRSAFE_TCHAR) #define STRSAFE_UNICODE 0 # include <strsafe.h> #undef STRSAFE_UNICODE #define STRSAFE_UNICODE 1 # include <strsafe.h> #undef STRSAFE_UNICODE -#undef STRSAFE_CXX #undef STRSAFE_CB -#undef STRSAFE_CXX_CB -#undef STRSAFE_CXX_CCH /* Implement Cch functions for ansi and unicode */ -#define STRSAFE_CXX_CB(x) x /= sizeof(STRSAFE_TCHAR) -#define STRSAFE_CXX_CCH(x) #define STRSAFE_UNICODE 0 # include <strsafe.h> #undef STRSAFE_UNICODE #define STRSAFE_UNICODE 1 # include <strsafe.h> #undef STRSAFE_UNICODE -#undef STRSAFE_CXX_CB -#undef STRSAFE_CXX_CCH #undef STRSAFE_PASS2 /* Now define the functions depending on UNICODE */ #if defined(UNICODE) +# define STRSAFE_UNICODE 1 +#else +# define STRSAFE_UNICODE 0 +#endif +#include <strsafe.h> +#undef STRSAFE_UNICODE + +#endif // !__STRSAFE_H_ + +/*****************************************************************************/ + +#if defined(STRSAFE_UNICODE) +#if (STRSAFE_UNICODE == 1) + +#define STRSAFE_LPTSTR STRSAFE_LPWSTR +#define STRSAFE_LPCTSTR STRSAFE_LPCWSTR +#define STRSAFE_TCHAR wchar_t #define StringCbCat StringCbCatW #define StringCbCatEx StringCbCatExW @@ -85,7 +98,11 @@ #define StringCchVPrintf StringCchVPrintfW #define StringCchVPrintfEx StringCchVPrintfExW -#else // !UNICODE +#else // (STRSAFE_UNICODE != 1) + +#define STRSAFE_LPTSTR STRSAFE_LPSTR +#define STRSAFE_LPCTSTR STRSAFE_LPCSTR +#define STRSAFE_TCHAR char #define StringCbCat StringCbCatA #define StringCbCatEx StringCbCatExA @@ -102,93 +119,21 @@ #define StringCbPrintfEx StringCbPrintfExA #define StringCbVPrintf StringCbVPrintfA #define StringCbVPrintfEx StringCbVPrintfExA - -#endif // !UNICODE - -#endif // !__STRSAFE_H_ - -/*****************************************************************************/ - -#if defined(STRSAFE_UNICODE) -#if (STRSAFE_UNICODE == 1) - -#define STRSAFE_LPTSTR STRSAFE_LPWSTR -#define STRSAFE_LPCTSTR STRSAFE_LPCWSTR -#define STRSAFE_TCHAR wchar_t - -#if defined(STRSAFE_CB) -#define StringCxxCat StringCbCatW -#define StringCxxCatEx StringCbCatExW -#define StringCxxCatN StringCbCatNW -#define StringCxxCatNEx StringCbCatNExW -#define StringCxxCopy StringCbCopyW -#define StringCxxCopyEx StringCbCopyExW -#define StringCxxCopyN StringCbCopyNW -#define StringCxxCopyNEx StringCbCopyNExW -#define StringCxxGets StringCbGetsW -#define StringCxxGetsEx StringCbGetsExW -#define StringCxxLength StringCbLengthW -#define StringCxxPrintf StringCbPrintfW -#define StringCxxPrintfEx StringCbPrintfExW -#define StringCxxVPrintf StringCbVPrintfW -#define StringCxxVPrintfEx StringCbVPrintfExW -#else // !STRSAFE_CB -#define StringCxxCat StringCchCatW -#define StringCxxCatEx StringCchCatExW -#define StringCxxCatN StringCchCatNW -#define StringCxxCatNEx StringCchCatNExW -#define StringCxxCopy StringCchCopyW -#define StringCxxCopyEx StringCchCopyExW -#define StringCxxCopyN StringCchCopyNW -#define StringCxxCopyNEx StringCchCopyNExW -#define StringCxxGets StringCchGetsW -#define StringCxxGetsEx StringCchGetsExW -#define StringCxxLength StringCchLengthW -#define StringCxxPrintf StringCchPrintfW -#define StringCxxPrintfEx StringCchPrintfExW -#define StringCxxVPrintf StringCchVPrintfW -#define StringCxxVPrintfEx StringCchVPrintfExW -#endif // !STRSAFE_CB - -#else // (STRSAFE_UNICODE != 1) - -#define STRSAFE_LPTSTR STRSAFE_LPSTR -#define STRSAFE_LPCTSTR STRSAFE_LPCSTR -#define STRSAFE_TCHAR char - -#if defined(STRSAFE_CB) -#define StringCxxCat StringCbCatA -#define StringCxxCatEx StringCbCatExA -#define StringCxxCatN StringCbCatNA -#define StringCxxCatNEx StringCbCatNExA -#define StringCxxCopy StringCbCopyA -#define StringCxxCopyEx StringCbCopyExA -#define StringCxxCopyN StringCbCopyNA -#define StringCxxCopyNEx StringCbCopyNExA -#define StringCxxGets StringCbGetsA -#define StringCxxGetsEx StringCbGetsExA -#define StringCxxLength StringCbLengthA -#define StringCxxPrintf StringCbPrintfA -#define StringCxxPrintfEx StringCbPrintfExA -#define StringCxxVPrintf StringCbVPrintfA -#define StringCxxVPrintfEx StringCbVPrintfExA -#else // !STRSAFE_CB -#define StringCxxCat StringCchCatA -#define StringCxxCatEx StringCchCatExA -#define StringCxxCatN StringCchCatNA -#define StringCxxCatNEx StringCchCatNExA -#define StringCxxCopy StringCchCopyA -#define StringCxxCopyEx StringCchCopyExA -#define StringCxxCopyN StringCchCopyNA -#define StringCopyNEx StringCchCopyNExA -#define StringCxxGets StringCchGetsA -#define StringCxxGetsEx StringCchGetsExA -#define StringCxxLength StringCchLengthA -#define StringCxxPrintf StringCchPrintfA -#define StringCxxPrintfEx StringCchPrintfExA -#define StringCxxVPrintf StringCchVPrintfA -#define StringCxxVPrintfEx StringCchVPrintfExA -#endif // !STRSAFE_CB +#define StringCchCat StringCchCatA +#define StringCchCatEx StringCchCatExA +#define StringCchCatN StringCchCatNA +#define StringCchCatNEx StringCchCatNExA +#define StringCchCopy StringCchCopyA +#define StringCchCopyEx StringCchCopyExA +#define StringCchCopyN StringCchCopyNA +#define StringCchCopyNEx StringCchCopyNExA +#define StringCchGets StringCchGetsA +#define StringCchGetsEx StringCchGetsExA +#define StringCchLength StringCchLengthA +#define StringCchPrintf StringCchPrintfA +#define StringCchPrintfEx StringCchPrintfExA +#define StringCchVPrintf StringCchVPrintfA +#define StringCchVPrintfEx StringCchVPrintfExA #endif // (STRSAFE_UNICODE != 1) #endif // defined(STRSAFE_UNICODE) @@ -196,6 +141,52 @@ /*****************************************************************************/ #if defined (STRSAFE_PASS2) + +#if defined(STRSAFE_CB) + +#define STRSAFE_CXXtoCB(x) (x) +#define STRSAFE_CBtoCXX(x) (x) +#define STRSAFE_CXXtoCCH(x) (x)*sizeof(STRSAFE_TCHAR) +#define STRSAFE_CCHtoCXX(x) (x)/sizeof(STRSAFE_TCHAR) +#define StringCxxCat StringCbCat +#define StringCxxCatEx StringCbCatEx +#define StringCxxCatN StringCbCatN +#define StringCxxCatNEx StringCbCatNEx +#define StringCxxCopy StringCbCopy +#define StringCxxCopyEx StringCbCopyEx +#define StringCxxCopyN StringCbCopyN +#define StringCxxCopyNEx StringCbCopyNEx +#define StringCxxGets StringCbGets +#define StringCxxGetsEx StringCbGetsEx +#define StringCxxLength StringCbLength +#define StringCxxPrintf StringCbPrintf +#define StringCxxPrintfEx StringCbPrintfEx +#define StringCxxVPrintf StringCbVPrintf +#define StringCxxVPrintfEx StringCbVPrintfEx + +#else // !STRSAFE_CB + +#define STRSAFE_CXXtoCB(x) (x)/sizeof(STRSAFE_TCHAR) +#define STRSAFE_CBtoCXX(x) (x)*sizeof(STRSAFE_TCHAR) +#define STRSAFE_CXXtoCCH(x) (x) +#define STRSAFE_CCHtoCXX(x) (x) +#define StringCxxCat StringCchCat +#define StringCxxCatEx StringCchCatEx +#define StringCxxCatN StringCchCatN +#define StringCxxCatNEx StringCchCatNEx +#define StringCxxCopy StringCchCopy +#define StringCxxCopyEx StringCchCopyEx +#define StringCxxCopyN StringCchCopyN +#define StringCxxCopyNEx StringCchCopyNEx +#define StringCxxGets StringCchGets +#define StringCxxGetsEx StringCchGetsEx +#define StringCxxLength StringCchLength +#define StringCxxPrintf StringCchPrintf +#define StringCxxPrintfEx StringCchPrintfEx +#define StringCxxVPrintf StringCchVPrintf +#define StringCxxVPrintfEx StringCchVPrintfEx + +#endif // !STRSAFE_CB #ifdef STRSAFE_LIB @@ -234,7 +225,6 @@ STRSAFEAPI StringCxxCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc) { - STRSAFE_CXX_CB(cxDest); return 0; // FIXME } @@ -283,9 +273,34 @@ return 0; // FIXME } -STRSAFEAPI StringCxxLength(STRSAFE_LPCTSTR psz, size_t cbMax, size_t *pcb) -{ - return 0; // FIXME +STRSAFEAPI StringCxxLength(STRSAFE_LPCTSTR psz, size_t cxMax, size_t *pcx) +{ + size_t cch = STRSAFE_CXXtoCCH(cxMax); + + /* Default return on error */ + if (pcx) + *pcx = 0; + + if (!psz || cch > STRSAFE_MAX_CCH || cch == 0) + { + return STRSAFE_E_INVALID_PARAMETER; + } + + while (*psz != 0 && cch != 0) + { + cch--; + psz++; + } + + if (cch == 0) + { + return STRSAFE_E_INVALID_PARAMETER; + } + + if (pcx) + *pcx = cxMax - STRSAFE_CCHtoCXX(cch); + + return S_OK; } STRSAFEAPI StringCxxVPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, va_list args) @@ -343,9 +358,45 @@ #undef StringCxxVPrintf #undef StringCxxVPrintfEx +#undef StringCbCat +#undef StringCbCatEx +#undef StringCbCatN +#undef StringCbCatNEx +#undef StringCbCopy +#undef StringCbCopyEx +#undef StringCbCopyN +#undef StringCbCopyNEx +#undef StringCbGets +#undef StringCbGetsEx +#undef StringCbLength +#undef StringCbPrintf +#undef StringCbPrintfEx +#undef StringCbVPrintf +#undef StringCbVPrintfEx +#undef StringCchCat +#undef StringCchCatEx +#undef StringCchCatN +#undef StringCchCatNEx +#undef StringCchCopy +#undef StringCchCopyEx +#undef StringCchCopyN +#undef StringCchCopyNEx +#undef StringCchGets +#undef StringCchGetsEx +#undef StringCchLength +#undef StringCchPrintf +#undef StringCchPrintfEx +#undef StringCchVPrintf +#undef StringCchVPrintfEx + #undef STRSAFE_LPTSTR #undef STRSAFE_LPCTSTR #undef STRSAFE_TCHAR +#undef STRSAFE_CXXtoCB +#undef STRSAFE_CBtoCXX +#undef STRSAFE_CXXtoCCH +#undef STRSAFE_CCHtoCXX + #endif // defined (STRSAFE_PASS2)

1 0

[tkreuzer] 35689: With a few more defines, strsafe.h can now implement all functions Cb/Cch, Ansi/Unicode from a single piece of code. Implement all Cb functions in the lib (depending on the unimplemented inline versions)
by tkreuzer＠svn.reactos.org 26 Aug '08

26 Aug '08

Author: tkreuzer Date: Tue Aug 26 18:06:18 2008 New Revision: 35689 URL: http://svn.reactos.org/svn/reactos?rev=35689&view=rev Log: With a few more defines, strsafe.h can now implement all functions Cb/Cch, Ansi/Unicode from a single piece of code. Implement all Cb functions in the lib (depending on the unimplemented inline versions) Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExA.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExW.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfW.c (with props) Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -20,24 +20,90 @@ typedef const wchar_t * STRSAFE_LPCWSTR; typedef unsigned long STRSAFE_DWORD; -/* Implement for ansi and unicode */ #define STRSAFE_PASS2 + +/* Implement Cb functions for ansi and unicode */ +#define STRSAFE_CB +#define STRSAFE_CXX_CB(x) +#define STRSAFE_CXX_CCH(x) x *= sizeof(STRSAFE_TCHAR) #define STRSAFE_UNICODE 0 # include <strsafe.h> #undef STRSAFE_UNICODE #define STRSAFE_UNICODE 1 # include <strsafe.h> #undef STRSAFE_UNICODE +#undef STRSAFE_CXX +#undef STRSAFE_CB +#undef STRSAFE_CXX_CB +#undef STRSAFE_CXX_CCH + +/* Implement Cch functions for ansi and unicode */ +#define STRSAFE_CXX_CB(x) x /= sizeof(STRSAFE_TCHAR) +#define STRSAFE_CXX_CCH(x) +#define STRSAFE_UNICODE 0 +# include <strsafe.h> +#undef STRSAFE_UNICODE +#define STRSAFE_UNICODE 1 +# include <strsafe.h> +#undef STRSAFE_UNICODE +#undef STRSAFE_CXX_CB +#undef STRSAFE_CXX_CCH + #undef STRSAFE_PASS2 /* Now define the functions depending on UNICODE */ -#ifdef UNICODE -# define STRSAFE_UNICODE 1 -#else -# define STRSAFE_UNICODE 0 -#endif -#include <strsafe.h> -#undef STRSAFE_UNICODE +#if defined(UNICODE) + +#define StringCbCat StringCbCatW +#define StringCbCatEx StringCbCatExW +#define StringCbCatN StringCbCatNW +#define StringCbCatNEx StringCbCatNExW +#define StringCbCopy StringCbCopyW +#define StringCbCopyEx StringCbCopyExW +#define StringCbCopyN StringCbCopyNW +#define StringCbCopyNEx StringCbCopyNExW +#define StringCbGets StringCbGetsW +#define StringCbGetsEx StringCbGetsExW +#define StringCbLength StringCbLengthW +#define StringCbPrintf StringCbPrintfW +#define StringCbPrintfEx StringCbPrintfExW +#define StringCbVPrintf StringCbVPrintfW +#define StringCbVPrintfEx StringCbVPrintfExW +#define StringCchCat StringCchCatW +#define StringCchCatEx StringCchCatExW +#define StringCchCatN StringCchCatNW +#define StringCchCatNEx StringCchCatNExW +#define StringCchCopy StringCchCopyW +#define StringCchCopyEx StringCchCopyExW +#define StringCchCopyN StringCchCopyNW +#define StringCchCopyNEx StringCchCopyNExW +#define StringCchGets StringCchGetsW +#define StringCchGetsEx StringCchGetsExW +#define StringCchLength StringCchLengthW +#define StringCchPrintf StringCchPrintfW +#define StringCchPrintfEx StringCchPrintfExW +#define StringCchVPrintf StringCchVPrintfW +#define StringCchVPrintfEx StringCchVPrintfExW + +#else // !UNICODE + +#define StringCbCat StringCbCatA +#define StringCbCatEx StringCbCatExA +#define StringCbCatN StringCbCatNA +#define StringCbCatNEx StringCbCatNExA +#define StringCbCopy StringCbCopyA +#define StringCbCopyEx StringCbCopyExA +#define StringCbCopyN StringCbCopyNA +#define StringCbCopyNEx StringCbCopyNExA +#define StringCbGets StringCbGetsA +#define StringCbGetsEx StringCbGetsExA +#define StringCbLength StringCbLengthA +#define StringCbPrintf StringCbPrintfA +#define StringCbPrintfEx StringCbPrintfExA +#define StringCbVPrintf StringCbVPrintfA +#define StringCbVPrintfEx StringCbVPrintfExA + +#endif // !UNICODE #endif // !__STRSAFE_H_ @@ -48,21 +114,81 @@ #define STRSAFE_LPTSTR STRSAFE_LPWSTR #define STRSAFE_LPCTSTR STRSAFE_LPCWSTR - -#define StringCbCat StringCbCatW -#define StringCbCopy StringCbCopyW -#define StringCbVPrintf StringCbVPrintfW -#define StringCbPrintf StringCbPrintfW +#define STRSAFE_TCHAR wchar_t + +#if defined(STRSAFE_CB) +#define StringCxxCat StringCbCatW +#define StringCxxCatEx StringCbCatExW +#define StringCxxCatN StringCbCatNW +#define StringCxxCatNEx StringCbCatNExW +#define StringCxxCopy StringCbCopyW +#define StringCxxCopyEx StringCbCopyExW +#define StringCxxCopyN StringCbCopyNW +#define StringCxxCopyNEx StringCbCopyNExW +#define StringCxxGets StringCbGetsW +#define StringCxxGetsEx StringCbGetsExW +#define StringCxxLength StringCbLengthW +#define StringCxxPrintf StringCbPrintfW +#define StringCxxPrintfEx StringCbPrintfExW +#define StringCxxVPrintf StringCbVPrintfW +#define StringCxxVPrintfEx StringCbVPrintfExW +#else // !STRSAFE_CB +#define StringCxxCat StringCchCatW +#define StringCxxCatEx StringCchCatExW +#define StringCxxCatN StringCchCatNW +#define StringCxxCatNEx StringCchCatNExW +#define StringCxxCopy StringCchCopyW +#define StringCxxCopyEx StringCchCopyExW +#define StringCxxCopyN StringCchCopyNW +#define StringCxxCopyNEx StringCchCopyNExW +#define StringCxxGets StringCchGetsW +#define StringCxxGetsEx StringCchGetsExW +#define StringCxxLength StringCchLengthW +#define StringCxxPrintf StringCchPrintfW +#define StringCxxPrintfEx StringCchPrintfExW +#define StringCxxVPrintf StringCchVPrintfW +#define StringCxxVPrintfEx StringCchVPrintfExW +#endif // !STRSAFE_CB #else // (STRSAFE_UNICODE != 1) #define STRSAFE_LPTSTR STRSAFE_LPSTR #define STRSAFE_LPCTSTR STRSAFE_LPCSTR - -#define StringCbCat StringCbCatA -#define StringCbCopy StringCbCopyA -#define StringCbVPrintf StringCbVPrintfA -#define StringCbPrintf StringCbPrintfA +#define STRSAFE_TCHAR char + +#if defined(STRSAFE_CB) +#define StringCxxCat StringCbCatA +#define StringCxxCatEx StringCbCatExA +#define StringCxxCatN StringCbCatNA +#define StringCxxCatNEx StringCbCatNExA +#define StringCxxCopy StringCbCopyA +#define StringCxxCopyEx StringCbCopyExA +#define StringCxxCopyN StringCbCopyNA +#define StringCxxCopyNEx StringCbCopyNExA +#define StringCxxGets StringCbGetsA +#define StringCxxGetsEx StringCbGetsExA +#define StringCxxLength StringCbLengthA +#define StringCxxPrintf StringCbPrintfA +#define StringCxxPrintfEx StringCbPrintfExA +#define StringCxxVPrintf StringCbVPrintfA +#define StringCxxVPrintfEx StringCbVPrintfExA +#else // !STRSAFE_CB +#define StringCxxCat StringCchCatA +#define StringCxxCatEx StringCchCatExA +#define StringCxxCatN StringCchCatNA +#define StringCxxCatNEx StringCchCatNExA +#define StringCxxCopy StringCchCopyA +#define StringCxxCopyEx StringCchCopyExA +#define StringCxxCopyN StringCchCopyNA +#define StringCopyNEx StringCchCopyNExA +#define StringCxxGets StringCchGetsA +#define StringCxxGetsEx StringCchGetsExA +#define StringCxxLength StringCchLengthA +#define StringCxxPrintf StringCchPrintfA +#define StringCxxPrintfEx StringCchPrintfExA +#define StringCxxVPrintf StringCchVPrintfA +#define StringCxxVPrintfEx StringCchVPrintfExA +#endif // !STRSAFE_CB #endif // (STRSAFE_UNICODE != 1) #endif // defined(STRSAFE_UNICODE) @@ -77,10 +203,21 @@ #define STRSAFEAPI HRESULT __stdcall #ifndef STRSAFE_NO_CB_FUNCTIONS -STRSAFEAPI StringCbCat(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc); -STRSAFEAPI StringCbCopy(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc); -STRSAFEAPI StringCbVPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, va_list args); -STRSAFEAPI StringCbPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, ...); +STRSAFEAPI StringCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc); +STRSAFEAPI StringCatEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCatN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend); +STRSAFEAPI StringCatNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCopy(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc); +STRSAFEAPI StringCopyEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringCopyN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc); +STRSAFEAPI StringCopyNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringGets(STRSAFE_LPTSTR pszDest, size_t cxDest); +STRSAFEAPI StringGetsEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags); +STRSAFEAPI StringLength(STRSAFE_LPCTSTR psz, size_t cxMax, size_t *pcb); +STRSAFEAPI StringPrintf(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszFormat, ...); +STRSAFEAPI StringPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCTSTR pszFormat, ...); +STRSAFEAPI StringVPrintf(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszFormat, va_list args); +STRSAFEAPI StringVPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, LPCTSTR pszFormat, va_list args); #endif // !STRSAFE_NO_CB_FUNCTIONS #ifndef STRSAFE_NO_CCH_FUNCTIONS @@ -95,34 +232,92 @@ #ifndef STRSAFE_NO_CB_FUNCTIONS -STRSAFEAPI StringCbCat(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc) -{ - return 0; // FIXME -} - -STRSAFEAPI -StringCbCopy(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc) -{ - return 0; // FIXME -} - -STRSAFEAPI -StringCbVPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, va_list args) -{ - return 0; // FIXME -} - -STRSAFEAPI -StringCbPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, ...) +STRSAFEAPI StringCxxCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc) +{ + STRSAFE_CXX_CB(cxDest); + return 0; // FIXME +} + +STRSAFEAPI StringCxxCatEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxCatN(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxCatNEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxCopy(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxCopyEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxCopyN(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxCopyNEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxGets(STRSAFE_LPTSTR pszDest, size_t cbDest) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxGetsEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxLength(STRSAFE_LPCTSTR psz, size_t cbMax, size_t *pcb) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxVPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, va_list args) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxVPrintfEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCTSTR pszFormat, va_list args) +{ + return 0; // FIXME +} + +STRSAFEAPI StringCxxPrintf(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszFormat, ...) { HRESULT result; va_list args; va_start(args, pszFormat); - result = StringCbVPrintf(pszDest, cbDest, pszFormat, args); + result = StringCxxVPrintf(pszDest, cbDest, pszFormat, args); va_end(args); return result; } +STRSAFEAPI StringCxxPrintfEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, STRSAFE_LPCTSTR pszFormat, ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCxxVPrintfEx(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); + va_end(args); + return result; +} + #endif // !STRSAFE_NO_CB_FUNCTIONS #ifndef STRSAFE_NO_CCH_FUNCTIONS @@ -132,13 +327,25 @@ #endif // !STRSAFE_LIB /* Functions are implemented or defined, clear #defines for next pass */ -#undef StringCbCat -#undef StringCbCopy -#undef StringCbVPrintf -#undef StringCbPrintf +#undef StringCxxCat +#undef StringCxxCatEx +#undef StringCxxCatN +#undef StringCxxCatNEx +#undef StringCxxCopy +#undef StringCxxCopyEx +#undef StringCxxCopyN +#undef StringCxxCopyNEx +#undef StringCxxGets +#undef StringCxxGetsEx +#undef StringCxxLength +#undef StringCxxPrintf +#undef StringCxxPrintfEx +#undef StringCxxVPrintf +#undef StringCxxVPrintfEx #undef STRSAFE_LPTSTR #undef STRSAFE_LPCTSTR +#undef STRSAFE_TCHAR #endif // defined (STRSAFE_PASS2) Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatExA _StringCbCatExA +#include <strsafe.h> + +#undef StringCbCatExA +HRESULT __stdcall +StringCbCatExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCbCatExA(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatExW _StringCbCatExW +#include <strsafe.h> + +#undef StringCbCatExW +HRESULT __stdcall +StringCbCatExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCbCatExW(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatNA _StringCbCatNA +#include <strsafe.h> + +#undef StringCbCatNA +HRESULT __stdcall +StringCbCatNA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbMaxAppend) +{ + /* Use the inlined version */ + return _StringCbCatNA(pszDest, cbDest, pszSrc, cbMaxAppend); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatNExA _StringCbCatNExA +#include <strsafe.h> + +#undef StringCbCatNExA +HRESULT __stdcall +StringCbCatNExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCbCatNExA(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatNExW _StringCbCatNExW +#include <strsafe.h> + +#undef StringCbCatNExW +HRESULT __stdcall +StringCbCatNExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCbCatNExW(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatNW _StringCbCatNW +#include <strsafe.h> + +#undef StringCbCatNW +HRESULT __stdcall +StringCbCatNW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbMaxAppend) +{ + /* Use the inlined version */ + return _StringCbCatNW(pszDest, cbDest, pszSrc, cbMaxAppend); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatNW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCatW _StringCbCatW +#include <strsafe.h> + +#undef StringCbCatW +HRESULT __stdcall +StringCbCatW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCbCatW(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCatW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,17 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyExA _StringCbCopyExA +#include <strsafe.h> + +#undef StringCbCopyExA +HRESULT __stdcall +StringCbCopyExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) +{ + /* Use the inlined version */ + return _StringCbCopyExA(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyExW _StringCbCopyExW +#include <strsafe.h> + +#undef StringCbCopyExW +HRESULT __stdcall +StringCbCopyExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCbCopyExW(pszDest, cbDest, pszSrc, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyNA _StringCbCopyNA +#include <strsafe.h> + +#undef StringCbCopyNA +HRESULT __stdcall +StringCbCopyNA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbSrc) +{ + /* Use the inlined version */ + return _StringCbCopyNA(pszDest, cbDest, pszSrc, cbSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyNExA _StringCbCopyNExA +#include <strsafe.h> + +#undef StringCbCopyNExA +HRESULT __stdcall +StringCbCopyNExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCbCopyNExA(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyNExW _StringCbCopyNExW +#include <strsafe.h> + +#undef StringCbCopyNExW +HRESULT __stdcall +StringCbCopyNExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbMaxAppend, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) + +{ + /* Use the inlined version */ + return _StringCbCopyNExW(pszDest, cbDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyNW _StringCbCopyNW +#include <strsafe.h> + +#undef StringCbCopyNW +HRESULT __stdcall +StringCbCopyNW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc, + size_t cbSrc) +{ + /* Use the inlined version */ + return _StringCbCopyNW(pszDest, cbDest, pszSrc, cbSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyNW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbCopyW _StringCbCopyW +#include <strsafe.h> + +#undef StringCbCopyW +HRESULT __stdcall +StringCbCopyW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszSrc) +{ + /* Use the inlined version */ + return _StringCbCopyW(pszDest, cbDest, pszSrc); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbCopyW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,13 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbGetsA _StringCbGetsA +#include <strsafe.h> + +#undef StringCbGetsA +HRESULT __stdcall +StringCbGetsA( + STRSAFE_LPSTR pszDest, + size_t cbDest) +{ + /* Use the inlined version */ + return _StringCbGetsA(pszDest, cbDest); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,16 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbGetsExA _StringCbGetsExA +#include <strsafe.h> + +#undef StringCbGetsExA +HRESULT __stdcall +StringCbGetsExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) +{ + /* Use the inlined version */ + return _StringCbGetsExA(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,16 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbGetsExW _StringCbGetsExW +#include <strsafe.h> + +#undef StringCbGetsExW +HRESULT __stdcall +StringCbGetsExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags) +{ + /* Use the inlined version */ + return _StringCbGetsExW(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,13 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbGetsW _StringCbGetsW +#include <strsafe.h> + +#undef StringCbGetsW +HRESULT __stdcall +StringCbGetsW( + STRSAFE_LPWSTR pszDest, + size_t cbDest) +{ + /* Use the inlined version */ + return _StringCbGetsW(pszDest, cbDest); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbGetsW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbLengthA _StringCbLengthA +#include <strsafe.h> + +#undef StringCbLengthA +HRESULT __stdcall +StringCbLengthA( + STRSAFE_LPCSTR psz, + size_t cbMax, + size_t *pcb) +{ + /* Use the inlined version */ + return _StringCbLengthA(psz, cbMax, pcb); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,14 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbLengthW _StringCbLengthW +#include <strsafe.h> + +#undef StringCbLengthW +HRESULT __stdcall +StringCbLengthW( + STRSAFE_LPCWSTR psz, + size_t cbMax, + size_t *pcb) +{ + /* Use the inlined version */ + return _StringCbLengthW(psz, cbMax, pcb); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbLengthW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,22 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbPrintfExA _StringCbPrintfExA +#include <strsafe.h> + +#undef StringCbPrintfExA +HRESULT __stdcall +StringCbPrintfExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCbVPrintfExA(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,22 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbPrintfExW _StringCbPrintfExW +#include <strsafe.h> + +#undef StringCbPrintfExW +HRESULT __stdcall +StringCbPrintfExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCbVPrintfExW(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,19 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbPrintfW _StringCbPrintfW +#include <strsafe.h> + +#undef StringCbPrintfW +HRESULT __stdcall +StringCbPrintfW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszFormat, + ...) +{ + HRESULT result; + va_list args; + va_start(args, pszFormat); + result = StringCbVPrintfW(pszDest, cbDest, pszFormat, args); + va_end(args); + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbPrintfW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbVPrintfA _StringCbVPrintfA +#include <strsafe.h> + +#undef StringCbVPrintfA +HRESULT __stdcall +StringCbVPrintfA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPCSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCbVPrintfA(pszDest, cbDest, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExA.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExA.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExA.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbVPrintfExA _StringCbVPrintfExA +#include <strsafe.h> + +#undef StringCbVPrintfExA +HRESULT __stdcall +StringCbVPrintfExA( + STRSAFE_LPSTR pszDest, + size_t cbDest, + STRSAFE_LPSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCbVPrintfExA(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,18 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbVPrintfExW _StringCbVPrintfExW +#include <strsafe.h> + +#undef StringCbVPrintfExW +HRESULT __stdcall +StringCbVPrintfExW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + STRSAFE_DWORD dwFlags, + STRSAFE_LPCWSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCbVPrintfExW(pszDest, cbDest, ppszDestEnd, pcbRemaining, dwFlags, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfW.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfW.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfW.c [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -1,0 +1,15 @@ +#define STRSAFE_NO_CCH_FUNCTIONS +#define StringCbVPrintfW _StringCbVPrintfW +#include <strsafe.h> + +#undef StringCbVPrintfW +HRESULT __stdcall +StringCbVPrintfW( + STRSAFE_LPWSTR pszDest, + size_t cbDest, + STRSAFE_LPCWSTR pszFormat, + va_list args) +{ + /* Use the inlined version */ + return _StringCbVPrintfW(pszDest, cbDest, pszFormat, args); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/StringCbVPrintfW.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/strsafe/strsafe.rbuild [iso-8859-1] Tue Aug 26 18:06:18 2008 @@ -3,6 +3,33 @@ <module name="strsafe" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> <file>StringCbCatA.c</file> + <file>StringCbCatW.c</file> + <file>StringCbCatExA.c</file> + <file>StringCbCatExW.c</file> + <file>StringCbCatNA.c</file> + <file>StringCbCatNW.c</file> + <file>StringCbCatNExA.c</file> + <file>StringCbCatNExW.c</file> <file>StringCbCopyA.c</file> + <file>StringCbCopyW.c</file> + <file>StringCbCopyExA.c</file> + <file>StringCbCopyExW.c</file> + <file>StringCbCopyNA.c</file> + <file>StringCbCopyNW.c</file> + <file>StringCbCopyNExA.c</file> + <file>StringCbCopyNExW.c</file> + <file>StringCbGetsA.c</file> + <file>StringCbGetsW.c</file> + <file>StringCbGetsExA.c</file> + <file>StringCbGetsExW.c</file> + <file>StringCbLengthA.c</file> + <file>StringCbLengthW.c</file> <file>StringCbPrintfA.c</file> + <file>StringCbPrintfW.c</file> + <file>StringCbPrintfExA.c</file> + <file>StringCbPrintfExW.c</file> + <file>StringCbVPrintfA.c</file> + <file>StringCbVPrintfW.c</file> + <file>StringCbVPrintfExA.c</file> + <file>StringCbVPrintfExW.c</file> </module>

1 0

[janderwald] 35688: - Revert 35686 - NetworkConnections is implemented in netshell.dll
by janderwald＠svn.reactos.org 26 Aug '08

26 Aug '08

Author: janderwald Date: Tue Aug 26 17:35:44 2008 New Revision: 35688 URL: http://svn.reactos.org/svn/reactos?rev=35688&view=rev Log: - Revert 35686 - NetworkConnections is implemented in netshell.dll Added: trunk/reactos/dll/win32/shell32/cpanelfolder.c - copied unchanged from r35685, trunk/reactos/dll/win32/shell32/cpanelfolder.c Removed: trunk/reactos/dll/win32/shell32/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/shell32/classes.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/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/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -386,11 +386,7 @@ if(LoadStringW(shell32_hInstance, IDS_ADMINISTRATIVETOOLS, szDest, buflen)) ret = TRUE; } - else if (IsEqualIID(riid, &CLSID_NetworkConnections)) - { - if(LoadStringW(shell32_hInstance, IDS_NETWORKCONNECTION, szDest, buflen)) - ret = TRUE; - } + } TRACE("-- %s\n", debugstr_w(szDest)); return ret; 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] Tue Aug 26 17:35:44 2008 @@ -620,9 +620,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" // special folders IDS_DESKTOP "Ðàáîòíà ïëîù" @@ -630,7 +627,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Êîø÷å" IDS_CONTROLPANEL "Êðèëî çà óïðàâëåíèå" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" // context menus IDS_VIEW_LARGE "&Ãîëåìè çíà÷åòà" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -619,9 +619,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Plocha" @@ -629,7 +626,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Ko" IDS_CONTROLPANEL "Ovládací panely" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Vedle sebe" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -621,9 +621,7 @@ IDS_SHV_COLUMN_COMMENTS "Kommentare" IDS_SHV_COLUMN_LOCATION "Ort" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Gerätename" - IDS_SHV_COLUMN_PHONE "Rufnummer oder Hostaddresse" - IDS_SHV_COLUMN_OWNER "Besitzer" + /* special folders */ IDS_DESKTOP "Desktop" @@ -631,7 +629,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Papierkorb" IDS_CONTROLPANEL "Systemsteuerung" IDS_ADMINISTRATIVETOOLS "Verwaltung" - IDS_NETWORKCONNECTION "Netzwerkverbindungen" /* context menus */ IDS_VIEW_LARGE "&Große Symbole" 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] Tue Aug 26 17:35:44 2008 @@ -618,9 +618,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "ÅðéöÜíåéá åñãáóßáò" @@ -628,7 +625,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "ÊÜäïò áíáêýêëùóçò" IDS_CONTROLPANEL "Ðßíáêáò åëÝã÷ïõ" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&ÌåãÜëá åéêïíßäéá" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -618,9 +618,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -628,7 +625,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -620,9 +620,6 @@ IDS_SHV_COLUMN_COMMENTS "Comentarios" IDS_SHV_COLUMN_LOCATION "Ubicación" IDS_SHV_COLUMN_MODEL "Modelo" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Escritorio" @@ -630,7 +627,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Papelera de reciclaje" IDS_CONTROLPANEL "Panel de control" IDS_ADMINISTRATIVETOOLS "Herramientas Administrativas" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Työpöytä" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Suuret Kuvakkeet" 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] Tue Aug 26 17:35:44 2008 @@ -621,9 +621,6 @@ IDS_SHV_COLUMN_COMMENTS "Commentaires" IDS_SHV_COLUMN_LOCATION "Emplacement" IDS_SHV_COLUMN_MODEL "Modèle" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Bureau" @@ -631,7 +628,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" IDS_CONTROLPANEL "Panneau de configuration" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Grandes icônes" 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] Tue Aug 26 17:35:44 2008 @@ -620,9 +620,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Asztal" @@ -630,7 +627,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Nagy képek" 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] Tue Aug 26 17:35:44 2008 @@ -618,9 +618,6 @@ IDS_SHV_COLUMN_COMMENTS "Commenti" IDS_SHV_COLUMN_LOCATION "Posizione" IDS_SHV_COLUMN_MODEL "Modello" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -628,7 +625,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Cestino" IDS_CONTROLPANEL "Pannello di controllo" IDS_ADMINISTRATIVETOOLS "Strumenti di amministrazione" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Icone Grandi" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "fXNgbv" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "å«¢ACR(&G)" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -596,9 +596,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Skrivebord" @@ -606,7 +603,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Papirkurv" IDS_CONTROLPANEL "Kontrollpanel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Store ikoner" 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] Tue Aug 26 17:35:44 2008 @@ -624,9 +624,6 @@ IDS_SHV_COLUMN_COMMENTS "Komentarze" IDS_SHV_COLUMN_LOCATION "Lokalizacja" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Pulpit" @@ -634,7 +631,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Kosz" IDS_CONTROLPANEL "Panel Sterowania" IDS_ADMINISTRATIVETOOLS "Narzêdzia Administracyjne" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Du¿e Ikony" 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] Tue Aug 26 17:35:44 2008 @@ -619,9 +619,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Área de trabalho" @@ -629,7 +626,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Ícones &grandes" 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] Tue Aug 26 17:35:44 2008 @@ -619,9 +619,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Ambiente de trabalho" @@ -629,7 +626,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Ícones &grandes" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Êîìåíòàðèè" IDS_SHV_COLUMN_LOCATION "Ðàñïîëîæåíèå" IDS_SHV_COLUMN_MODEL "Ìîäåëü" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Ðàáî÷èé ñòîë" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Êîðçèíà" IDS_CONTROLPANEL "Ïàíåëü óïðàâëåíèÿ" IDS_ADMINISTRATIVETOOLS "Àäìèíèñòðèðîâàíèå" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Áîëüøèå çíà÷êè" 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] Tue Aug 26 17:35:44 2008 @@ -623,9 +623,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Pracovná plocha" @@ -633,7 +630,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Kô" IDS_CONTROLPANEL "Ovládací panel" IDS_ADMINISTRATIVETOOLS "Nástroje na správu" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Ve¾ké ikony" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" 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] Tue Aug 26 17:35:44 2008 @@ -617,9 +617,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Masaüstü" @@ -627,7 +624,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Çöp" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Bü&yük Simgeler" 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] Tue Aug 26 17:35:44 2008 @@ -618,9 +618,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Ðîáî÷èé ñò³ë" @@ -628,7 +625,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Êîøèê" IDS_CONTROLPANEL "Ïàíåëü êåðóâàííÿ" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "&Âåëèê³ çíà÷êè" 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] Tue Aug 26 17:35:44 2008 @@ -606,9 +606,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "×ÀÃæ" @@ -616,7 +613,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "»ØÊÕÕ¾" IDS_CONTROLPANEL "¿ØÖÆÃæ°å" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "´óÍ¼±ê(&G)" 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] Tue Aug 26 17:35:44 2008 @@ -618,9 +618,6 @@ IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" /* special folders */ IDS_DESKTOP "Desktop" @@ -628,7 +625,6 @@ IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" - IDS_NETWORKCONNECTION "Network Connections" /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -1622,16 +1622,6 @@ return FALSE; } -BOOL _ILIsNetConnect(LPCITEMIDLIST pidl) -{ - REFIID iid = _ILGetGUIDPointer(pidl); - - TRACE("(%p)\n",pidl); - - if (iid) - return IsEqualIID(iid, &CLSID_NetworkConnections); - return FALSE; -} LPITEMIDLIST _ILCreateNetHood(void) { @@ -1642,12 +1632,6 @@ { return _ILCreateGuid(PT_GUID, &CLSID_FontsFolderShortcut); } - -LPITEMIDLIST _ILCreateNetConnect(void) -{ - return _ILCreateGuid(PT_GUID, &CLSID_NetworkConnections); -} - BOOL _ILIsMyComputer(LPCITEMIDLIST pidl) { Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -239,7 +239,6 @@ BOOL _ILIsBitBucket (LPCITEMIDLIST pidl); BOOL _ILIsAdminTools (LPCITEMIDLIST pidl); BOOL _ILIsNetHood (LPCITEMIDLIST pidl); -BOOL _ILIsNetConnect (LPCITEMIDLIST pidl); BOOL _ILIsDrive (LPCITEMIDLIST pidl); BOOL _ILIsFolder (LPCITEMIDLIST pidl); BOOL _ILIsValue (LPCITEMIDLIST pidl); @@ -288,10 +287,8 @@ LPITEMIDLIST _ILCreatePrinters (void); LPITEMIDLIST _ILCreateNetwork (void); LPITEMIDLIST _ILCreateNetHood (void); -LPITEMIDLIST _ILCreateNetConnect (void); LPITEMIDLIST _ILCreateAdminTools (void); LPITEMIDLIST _ILCreateFont (void); -LPITEMIDLIST _ILCreateNetConnect (void); LPITEMIDLIST _ILCreateBitBucket (void); LPITEMIDLIST _ILCreateDrive (LPCWSTR); Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -44,7 +44,7 @@ #include <shtypes.h> #include <ndk/ntndk.h> #include <fmifs/fmifs.h> -//#include <largeint.h> +#include <largeint.h> #include "base/shell/explorer-new/todo.h" @@ -72,7 +72,6 @@ extern const GUID CLSID_UnixDosFolder; extern const GUID SHELL32_AdvtShortcutProduct; extern const GUID SHELL32_AdvtShortcutComponent; -extern const GUID CLSID_NetworkConnections; #endif Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -25,7 +25,6 @@ const GUID CLSID_UnixFolder = {0xcc702eb2, 0x7dc5, 0x11d9, {0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd}}; const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; const GUID CLSID_FontsFolderShortcut = {0xD20EA4E1, 0x3957, 0x11D2, {0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41,0x52}}; -const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID SHELL32_AdvtShortcutProduct = {0x9db1186f, 0x40df, 0x11d1, {0xaa, 0x8c, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63}}; const GUID SHELL32_AdvtShortcutComponent = {0x9db1186e, 0x40df, 0x11d1, {0xaa, 0x8c, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63}}; @@ -623,19 +622,6 @@ 0, NULL, NULL, - IDI_SHELL_NETWORK_FOLDER - }, - { &CLSID_NetworkConnections, - "Network Connections", - IDS_NETWORKCONNECTION, - NULL, - "shell32.dll", - "Apartment", - SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES, - SFGAO_FOLDER, - 0, - NULL, - NULL, IDI_SHELL_MY_NETWORK_PLACES }, { &CLSID_FontsFolderShortcut, @@ -759,7 +745,6 @@ static const WCHAR wszPrinters[] = { 'P','r','i','n','t','e','r','s',0 }; static const WCHAR wszFonts[] = { 'F','o','n','t','s',0 }; static const WCHAR wszAdminTools[] = { 'A','d','m','i','n','T','o','o','l','s',0 }; -static const WCHAR wszNetConnect[] = { 'N','e','t','w','o','r','k',' ','C','o','n','n','e','c','t','i','o','n','s',0 }; const GUID CLSID_FolderOptions = { 0x6DFD7C5C, 0x2451, 0x11d3, {0xa2,0x99,0x00,0xC0,0x4F,0x8e,0xf6,0xaf} }; static struct regsvr_namespace const namespace_extensions_list[] = { @@ -809,11 +794,6 @@ &CLSID_AdminFolderShortcut, wszControlPanel, wszAdminTools - }, - { - &CLSID_NetworkConnections, - wszControlPanel, - wszNetConnect }, { NULL } }; Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -60,7 +60,6 @@ <file>shfldr_admintools.c</file> <file>shfldr_netplaces.c</file> <file>shfldr_fonts.c</file> - <file>shfldr_netconnect.c</file> <file>shfldr_cpanel.c</file> <file>shfldr_recyclebin.c</file> <file>shlexec.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -99,7 +99,6 @@ HRESULT WINAPI ISF_MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_NetworkPlaces_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_Fonts_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); -HRESULT WINAPI ISF_NetConnect_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_AdminTools_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Tue Aug 26 17:35:44 2008 @@ -54,7 +54,6 @@ {&CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, {&CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor}, - {&CLSID_NetworkConnections, &ISF_NetConnect_Constructor}, {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_AdminFolderShortcut, &ISF_AdminTools_Constructor}, {&CLSID_RecycleBin, &RecycleBin_Constructor}, Removed: trunk/reactos/dll/win32/shell32/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_netconnect.c (removed) @@ -1,781 +1,0 @@ -/* - * Network Connections Shell Folder - * - * Copyright 2008 Johannes Anderwald <janderwald(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <precomp.h> - -WINE_DEFAULT_DEBUG_CHANNEL (shell); - -/*********************************************************************** -* IShellFolder implementation -*/ - -typedef struct { - const IShellFolder2Vtbl *lpVtbl; - LONG ref; - const IContextMenu2Vtbl *lpVtblContextMenu; - const IPersistFolder2Vtbl *lpVtblPersistFolder2; - - /* both paths are parsible from the desktop */ - LPITEMIDLIST pidlRoot; /* absolute pidl */ - LPCITEMIDLIST apidl; /* currently focused font item */ -} IGenericSFImpl, *LPIGenericSFImpl; - - -static const shvheader NetConnectSFHeader[] = { - {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN_STATUS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN_DEVNAME, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 12}, - {IDS_SHV_COLUMN_PHONE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN_OWNER, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 5} -}; - -#define NETCONNECTSHELLVIEWCOLUMNS 6 - -#define COLUMN_NAME 0 -#define COLUMN_TYPE 1 -#define COLUMN_STATUS 2 -#define COLUMN_DEVNAME 3 -#define COLUMN_PHONE 4 -#define COLUMN_OWNER 5 - -static LPIGenericSFImpl __inline impl_from_IContextMenu2(IContextMenu2 *iface) -{ - return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblContextMenu)); -} - -static LPIGenericSFImpl __inline impl_from_IPersistFolder2(IPersistFolder2 *iface) -{ - return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)); -} - -/************************************************************************** - * ISF_NetConnect_fnQueryInterface - * - * NOTE - * supports not IPersist/IPersistFolder - */ -static HRESULT WINAPI ISF_NetConnect_fnQueryInterface (IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - - *ppvObj = NULL; - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IShellFolder) || - IsEqualIID (riid, &IID_IShellFolder2)) - { - *ppvObj = This; - } - else if (IsEqualIID (riid, &IID_IPersistFolder) || - IsEqualIID (riid, &IID_IPersistFolder2)) - { - *ppvObj = (LPVOID *)&This->lpVtblPersistFolder2; - } - if (*ppvObj) - { - IUnknown_AddRef ((IUnknown *) (*ppvObj)); - TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); - return S_OK; - } - - TRACE ("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -static ULONG WINAPI ISF_NetConnect_fnAddRef (IShellFolder2 * iface) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); - - return refCount; -} - -static ULONG WINAPI ISF_NetConnect_fnRelease (IShellFolder2 * iface) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); - - if (!refCount) { - TRACE ("-- destroying IShellFolder(%p)\n", This); - SHFree (This->pidlRoot); - HeapFree (GetProcessHeap(), 0, This); - } - return refCount; -} - -/************************************************************************** -* ISF_NetConnect_fnParseDisplayName -*/ -static HRESULT WINAPI ISF_NetConnect_fnParseDisplayName (IShellFolder2 * iface, - HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, - DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - HRESULT hr = E_UNEXPECTED; - - TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", This, - hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), - pchEaten, ppidl, pdwAttributes); - - *ppidl = 0; - if (pchEaten) - *pchEaten = 0; /* strange but like the original */ - - TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); - - return hr; -} - -/************************************************************************** - * CreateNetConnectEnumListss() - */ -static BOOL CreateNetConnectEnumList(IEnumIDList *list, DWORD dwFlags) -{ - - return FALSE; -} - -/************************************************************************** -* ISF_NetConnect_fnEnumObjects -*/ -static HRESULT WINAPI ISF_NetConnect_fnEnumObjects (IShellFolder2 * iface, - HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, - hwndOwner, dwFlags, ppEnumIDList); - - *ppEnumIDList = IEnumIDList_Constructor(); - if(*ppEnumIDList) - CreateNetConnectEnumList(*ppEnumIDList, dwFlags); - - TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - - return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; -} - -/************************************************************************** -* ISF_NetConnect_fnBindToObject -*/ -static HRESULT WINAPI ISF_NetConnect_fnBindToObject (IShellFolder2 * iface, - LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, - pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); - - return SHELL32_BindToChild (This->pidlRoot, NULL, pidl, riid, ppvOut); -} - -/************************************************************************** -* ISF_NetConnect_fnBindToStorage -*/ -static HRESULT WINAPI ISF_NetConnect_fnBindToStorage (IShellFolder2 * iface, - LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, - pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); - - *ppvOut = NULL; - return E_NOTIMPL; -} - -/************************************************************************** -* ISF_NetConnect_fnCompareIDs -*/ - -static HRESULT WINAPI ISF_NetConnect_fnCompareIDs (IShellFolder2 * iface, - LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - int nReturn; - - TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs ((IShellFolder*)This, lParam, pidl1, pidl2); - TRACE ("-- %i\n", nReturn); - return nReturn; -} - -/************************************************************************** -* ISF_NetConnect_fnCreateViewObject -*/ -static HRESULT WINAPI ISF_NetConnect_fnCreateViewObject (IShellFolder2 * iface, - HWND hwndOwner, REFIID riid, LPVOID * ppvOut) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - LPSHELLVIEW pShellView; - HRESULT hr = E_INVALIDARG; - - TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, - hwndOwner, shdebugstr_guid (riid), ppvOut); - - if (!ppvOut) - return hr; - - *ppvOut = NULL; - - if (IsEqualIID (riid, &IID_IShellView)) - { - pShellView = IShellView_Constructor ((IShellFolder *) iface); - if (pShellView) - { - hr = IShellView_QueryInterface (pShellView, riid, ppvOut); - IShellView_Release (pShellView); - } - } - TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); - return hr; -} - -/************************************************************************** -* ISF_NetConnect_fnGetAttributesOf -*/ -static HRESULT WINAPI ISF_NetConnect_fnGetAttributesOf (IShellFolder2 * iface, - UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - HRESULT hr = S_OK; - - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, - cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); - - if (!rgfInOut) - return E_INVALIDARG; - if (cidl && !apidl) - return E_INVALIDARG; - - if (*rgfInOut == 0) - *rgfInOut = ~0; - - /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ - *rgfInOut &= ~SFGAO_VALIDATE; - - TRACE ("-- result=0x%08x\n", *rgfInOut); - return hr; -} - -/************************************************************************** -* ISF_NetConnect_fnGetUIObjectOf -* -* PARAMETERS -* hwndOwner [in] Parent window for any output -* cidl [in] array size -* apidl [in] simple pidl array -* riid [in] Requested Interface -* prgfInOut [ ] reserved -* ppvObject [out] Resulting Interface -* -*/ -static HRESULT WINAPI ISF_NetConnect_fnGetUIObjectOf (IShellFolder2 * iface, - HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, - UINT * prgfInOut, LPVOID * ppvOut) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - IUnknown *pObj = NULL; - HRESULT hr = E_INVALIDARG; - - TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", This, - hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut); - - if (!ppvOut) - return hr; - - *ppvOut = NULL; - - if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) - { - pObj = (IUnknown*)(&This->lpVtblContextMenu); - This->apidl = apidl[0]; - IUnknown_AddRef(pObj); - hr = S_OK; - } - else - hr = E_NOINTERFACE; - - if (SUCCEEDED(hr) && !pObj) - hr = E_OUTOFMEMORY; - - *ppvOut = pObj; - TRACE ("(%p)->hr=0x%08x\n", This, hr); - return hr; -} - -/************************************************************************** -* ISF_NetConnect_fnGetDisplayNameOf -* -*/ -static HRESULT WINAPI ISF_NetConnect_fnGetDisplayNameOf (IShellFolder2 * iface, - LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) -{ - LPWSTR pszName; - HRESULT hr = E_FAIL; - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - TRACE("ISF_NetConnect_fnGetDisplayNameOf (%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); - - if (!strRet) - return E_INVALIDARG; - - pszName = CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); - if (!pszName) - return E_OUTOFMEMORY; - - if (_ILIsNetConnect (pidl)) - { - if (HCR_GetClassNameW(&CLSID_NetworkConnections, pszName, MAX_PATH)) - hr = S_OK; - } - - if (SUCCEEDED(hr)) - { - strRet->uType = STRRET_WSTR; - strRet->u.pOleStr = pszName; - } - else - CoTaskMemFree(pszName); - - return hr; -} - -/************************************************************************** -* ISF_NetConnect_fnSetNameOf -* Changes the name of a file object or subfolder, possibly changing its item -* identifier in the process. -* -* PARAMETERS -* hwndOwner [in] Owner window for output -* pidl [in] simple pidl of item to change -* lpszName [in] the items new display name -* dwFlags [in] SHGNO formatting flags -* ppidlOut [out] simple pidl returned -*/ -static HRESULT WINAPI ISF_NetConnect_fnSetNameOf (IShellFolder2 * iface, - HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, - hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); - return E_NOTIMPL; -} - -static HRESULT WINAPI ISF_NetConnect_fnGetDefaultSearchGUID ( - IShellFolder2 * iface, GUID * pguid) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI ISF_NetConnect_fnEnumSearches (IShellFolder2 * iface, - IEnumExtraSearch ** ppenum) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI ISF_NetConnect_fnGetDefaultColumn (IShellFolder2 * iface, - DWORD dwRes, ULONG * pSort, ULONG * pDisplay) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - TRACE ("(%p)\n", This); - - if (pSort) - *pSort = 0; - if (pDisplay) - *pDisplay = 0; - - return S_OK; -} - -static HRESULT WINAPI ISF_NetConnect_fnGetDefaultColumnState ( - IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - TRACE ("(%p)\n", This); - - if (!pcsFlags || iColumn >= NETCONNECTSHELLVIEWCOLUMNS) - return E_INVALIDARG; - *pcsFlags = NetConnectSFHeader[iColumn].pcsFlags; - return S_OK; -} - -static HRESULT WINAPI ISF_NetConnect_fnGetDetailsEx (IShellFolder2 * iface, - LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI ISF_NetConnect_fnGetDetailsOf (IShellFolder2 * iface, - LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - WCHAR buffer[MAX_PATH] = {0}; - HRESULT hr = E_FAIL; - - TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd); - - if (iColumn >= NETCONNECTSHELLVIEWCOLUMNS) - return E_FAIL; - - psd->fmt = NetConnectSFHeader[iColumn].fmt; - psd->cxChar = NetConnectSFHeader[iColumn].cxChar; - if (pidl == NULL) - { - psd->str.uType = STRRET_WSTR; - if (LoadStringW(shell32_hInstance, NetConnectSFHeader[iColumn].colnameid, buffer, MAX_PATH)) - hr = SHStrDupW(buffer, &psd->str.u.pOleStr); - - return hr; - } - - if (iColumn == COLUMN_NAME) - { - psd->str.uType = STRRET_WSTR; - return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str); - } - - psd->str.uType = STRRET_CSTR; - psd->str.u.cStr[0] = '\0'; - - switch(iColumn) - { - case COLUMN_NAME: - case COLUMN_TYPE: - case COLUMN_STATUS: - case COLUMN_DEVNAME: - case COLUMN_PHONE: - case COLUMN_OWNER: - break; - } - - return E_FAIL; -} - -static HRESULT WINAPI ISF_NetConnect_fnMapColumnToSCID (IShellFolder2 * iface, - UINT column, SHCOLUMNID * pscid) -{ - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p)\n", This); - - return E_NOTIMPL; -} - -static const IShellFolder2Vtbl vt_ShellFolder2 = { - ISF_NetConnect_fnQueryInterface, - ISF_NetConnect_fnAddRef, - ISF_NetConnect_fnRelease, - ISF_NetConnect_fnParseDisplayName, - ISF_NetConnect_fnEnumObjects, - ISF_NetConnect_fnBindToObject, - ISF_NetConnect_fnBindToStorage, - ISF_NetConnect_fnCompareIDs, - ISF_NetConnect_fnCreateViewObject, - ISF_NetConnect_fnGetAttributesOf, - ISF_NetConnect_fnGetUIObjectOf, - ISF_NetConnect_fnGetDisplayNameOf, - ISF_NetConnect_fnSetNameOf, - /* ShellFolder2 */ - ISF_NetConnect_fnGetDefaultSearchGUID, - ISF_NetConnect_fnEnumSearches, - ISF_NetConnect_fnGetDefaultColumn, - ISF_NetConnect_fnGetDefaultColumnState, - ISF_NetConnect_fnGetDetailsEx, - ISF_NetConnect_fnGetDetailsOf, - ISF_NetConnect_fnMapColumnToSCID -}; - -/************************************************************************** -* IContextMenu2 Implementation -*/ - -/************************************************************************ - * ISF_NetConnect_IContextMenu_QueryInterface - */ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_QueryInterface(IContextMenu2 * iface, REFIID iid, LPVOID * ppvObject) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - TRACE("(%p)\n", This); - - return IShellFolder2_QueryInterface((IShellFolder2*)This, iid, ppvObject); -} - -/************************************************************************ - * ISF_NetConnect_IContextMenu_AddRef - */ -static ULONG WINAPI ISF_NetConnect_IContextMenu2_AddRef(IContextMenu2 * iface) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - TRACE("(%p)->(count=%u)\n", This, This->ref); - - return IShellFolder2_AddRef((IShellFolder2*)This); -} - -/************************************************************************ - * ISF_NetConnect_IContextMenu_Release - */ -static ULONG WINAPI ISF_NetConnect_IContextMenu2_Release(IContextMenu2 * iface) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - TRACE("(%p)->(count=%u)\n", This, This->ref); - - return IShellFolder2_Release((IShellFolder2*)This); -} - -/************************************************************************** -* ISF_NetConnect_IContextMenu_QueryContextMenu() -*/ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_QueryContextMenu( - IContextMenu2 *iface, - HMENU hMenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags) -{ - int Count = 1; - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", - This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); -} - - -/************************************************************************** -* ISF_NetConnect_IContextMenu_InvokeCommand() -*/ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_InvokeCommand( - IContextMenu2 *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - - TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - - return S_OK; -} - -/************************************************************************** - * ISF_NetConnect_IContextMenu_GetCommandString() - * - */ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_GetCommandString( - IContextMenu2 *iface, - UINT_PTR idCommand, - UINT uFlags, - UINT* lpReserved, - LPSTR lpszName, - UINT uMaxNameLen) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); - - - return E_FAIL; -} - - - -/************************************************************************** -* ISF_NetConnect_IContextMenu_HandleMenuMsg() -*/ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_HandleMenuMsg( - IContextMenu2 *iface, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - - TRACE("ISF_NetConnect_IContextMenu_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); - - return E_NOTIMPL; -} - -static const IContextMenu2Vtbl vt_ContextMenu2 = -{ - ISF_NetConnect_IContextMenu2_QueryInterface, - ISF_NetConnect_IContextMenu2_AddRef, - ISF_NetConnect_IContextMenu2_Release, - ISF_NetConnect_IContextMenu2_QueryContextMenu, - ISF_NetConnect_IContextMenu2_InvokeCommand, - ISF_NetConnect_IContextMenu2_GetCommandString, - ISF_NetConnect_IContextMenu2_HandleMenuMsg -}; - -/************************************************************************ - * ISF_NetConnect_PersistFolder2_QueryInterface - */ -static HRESULT WINAPI ISF_NetConnect_PersistFolder2_QueryInterface (IPersistFolder2 * iface, - REFIID iid, LPVOID * ppvObj) -{ - IGenericSFImpl * This = impl_from_IPersistFolder2(iface); - - TRACE ("(%p)\n", This); - - return IShellFolder2_QueryInterface ((IShellFolder2*)This, iid, ppvObj); -} - -/************************************************************************ - * ISF_NetConnect_PersistFolder2_AddRef - */ -static ULONG WINAPI ISF_NetConnect_PersistFolder2_AddRef (IPersistFolder2 * iface) -{ - IGenericSFImpl * This = impl_from_IPersistFolder2(iface); - - TRACE ("(%p)->(count=%u)\n", This, This->ref); - - return IShellFolder2_AddRef((IShellFolder2*)This); -} - -/************************************************************************ - * ISF_NetConnect_PersistFolder2_Release - */ -static ULONG WINAPI ISF_NetConnect_PersistFolder2_Release (IPersistFolder2 * iface) -{ - IGenericSFImpl * This = impl_from_IPersistFolder2(iface); - - TRACE ("(%p)->(count=%u)\n", This, This->ref); - - return IShellFolder2_Release((IShellFolder2*)This); -} - -/************************************************************************ - * ISF_NetConnect_PersistFolder2_GetClassID - */ -static HRESULT WINAPI ISF_NetConnect_PersistFolder2_GetClassID ( - IPersistFolder2 * iface, CLSID * lpClassId) -{ - IGenericSFImpl * This = impl_from_IPersistFolder2(iface); - - TRACE ("(%p)\n", This); - - if (!lpClassId) - return E_POINTER; - - *lpClassId = CLSID_NetworkConnections; - - return S_OK; -} - -/************************************************************************ - * ISF_NetConnect_PersistFolder2_Initialize - * - * NOTES: it makes no sense to change the pidl - */ -static HRESULT WINAPI ISF_NetConnect_PersistFolder2_Initialize ( - IPersistFolder2 * iface, LPCITEMIDLIST pidl) -{ - IGenericSFImpl * This = impl_from_IPersistFolder2(iface); - - TRACE ("(%p)->(%p)\n", This, pidl); - - - return E_NOTIMPL; -} - -/************************************************************************** - * ISF_NetConnect_PersistFolder2_GetCurFolder - */ -static HRESULT WINAPI ISF_NetConnect_PersistFolder2_GetCurFolder ( - IPersistFolder2 * iface, LPITEMIDLIST * pidl) -{ - IGenericSFImpl * This = impl_from_IPersistFolder2(iface); - - TRACE ("(%p)->(%p)\n", This, pidl); - - if (!pidl) - return E_POINTER; - - *pidl = ILClone (This->pidlRoot); - - return S_OK; -} - -static const IPersistFolder2Vtbl vt_PersistFolder2 = -{ - ISF_NetConnect_PersistFolder2_QueryInterface, - ISF_NetConnect_PersistFolder2_AddRef, - ISF_NetConnect_PersistFolder2_Release, - ISF_NetConnect_PersistFolder2_GetClassID, - ISF_NetConnect_PersistFolder2_Initialize, - ISF_NetConnect_PersistFolder2_GetCurFolder -}; - -/************************************************************************** -* ISF_NetConnect_Constructor -*/ -HRESULT WINAPI ISF_NetConnect_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IGenericSFImpl *sf; - - TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); - - if (!ppv) - return E_POINTER; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - sf = (IGenericSFImpl *) HeapAlloc ( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); - if (!sf) - return E_OUTOFMEMORY; - - sf->ref = 1; - sf->lpVtbl = &vt_ShellFolder2; - sf->lpVtblPersistFolder2 = &vt_PersistFolder2; - sf->lpVtblContextMenu = &vt_ContextMenu2; - sf->pidlRoot = _ILCreateNetConnect(); /* my qualified pidl */ - - if (!SUCCEEDED (IShellFolder2_QueryInterface ((IShellFolder2*)sf, riid, ppv))) - { - IShellFolder2_Release((IShellFolder2*)sf); - return E_NOINTERFACE; - } - - TRACE ("--(%p)\n", sf); - return S_OK; -} 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] Tue Aug 26 17:35:44 2008 @@ -89,7 +89,6 @@ #define IDS_NETWORKPLACE 75 #define IDS_FONTS 76 #define IDS_PRINTERS 77 -#define IDS_NETWORKCONNECTION 78 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129 @@ -166,10 +165,6 @@ #define IDS_FORMATDRIVE 327 #define IDS_RENAME 328 #define IDS_INSERT 329 -#define IDS_SHV_COLUMN_DEVNAME 330 -#define IDS_SHV_COLUMN_PHONE 331 -#define IDS_SHV_COLUMN_OWNER 332 - /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964 @@ -246,7 +241,6 @@ #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_CONTROL_PANEL1 330 #define IDI_SHELL_ADMINTOOLS 328 -#define IDI_SHELL_NETWORK_FOLDER 172 // Icons for Folder Options (ID's identical to Windows XP SP3) #define IDI_SHELL_SHOW_COMMON_TASKS 182

1 0

[pschweitzer] 35687: - Added ioevent.h that contains Win2k3 GUIDs for pnp event notifications - Added a ioevent lib which is used in ntoskrnl for GUIDs - Implemented FsRtlNotifyVolumeEvent. Some details seem to be wrong (such as IoReportTargetDeviceChangeAsynchronous call in all cases) and should be reviewed. Moreover IoReportTargetDeviceChangeAsynchronous isn't implemented, so we crash a bit farther.
by pschweitzer＠svn.reactos.org 26 Aug '08

26 Aug '08

Author: pschweitzer Date: Tue Aug 26 16:37:27 2008 New Revision: 35687 URL: http://svn.reactos.org/svn/reactos?rev=35687&view=rev Log: - Added ioevent.h that contains Win2k3 GUIDs for pnp event notifications - Added a ioevent lib which is used in ntoskrnl for GUIDs - Implemented FsRtlNotifyVolumeEvent. Some details seem to be wrong (such as IoReportTargetDeviceChangeAsynchronous call in all cases) and should be reviewed. Moreover IoReportTargetDeviceChangeAsynchronous isn't implemented, so we crash a bit farther. Added: branches/pierre-fsd/include/psdk/ioevent.h (with props) branches/pierre-fsd/lib/sdk/ioevent/ (with props) branches/pierre-fsd/lib/sdk/ioevent/ioevent.c (with props) branches/pierre-fsd/lib/sdk/ioevent/ioevent.rbuild (with props) Modified: branches/pierre-fsd/lib/sdk/sdk.rbuild branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild Added: branches/pierre-fsd/include/psdk/ioevent.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/psdk/ioevent… ============================================================================== --- branches/pierre-fsd/include/psdk/ioevent.h (added) +++ branches/pierre-fsd/include/psdk/ioevent.h [iso-8859-1] Tue Aug 26 16:37:27 2008 @@ -1,0 +1,65 @@ +/* + * ioevent.h + * + * PnP Event Notification GUIDs + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +DEFINE_GUID(GUID_IO_VOLUME_CHANGE, + 0x7373654AL, 0x812A, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_IO_VOLUME_DISMOUNT, + 0xD16A55E8L, 0x1059, 0x11D2, 0x8F, 0xFD, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_DISMOUNT_FAILED, + 0xE3C5B178L, 0x105D, 0x11D2, 0x8F, 0xFD, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_MOUNT, + 0xB5804878L, 0x1A96, 0x11D2, 0x8F, 0xFD, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_LOCK, + 0x50708874L, 0xC9AF, 0x11D1, 0x8F, 0xEF, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_LOCK_FAILED, + 0xAE2EED10L, 0x0BA8, 0x11D2, 0x8F, 0xFB, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_UNLOCK, + 0x9A8C3D68L, 0xD0CB, 0x11D1, 0x8F, 0xEF, 0x00, 0xA0, 0xC9, 0xA0, 0x6D, 0x32); +DEFINE_GUID(GUID_IO_VOLUME_NAME_CHANGE, + 0x2DE97F83, 0x4C06, 0x11D2, 0xA5, 0x32, 0x00, 0x60, 0x97, 0x13, 0x05, 0x5A); +DEFINE_GUID(GUID_IO_VOLUME_PREPARING_EJECT, + 0xC79EB16E, 0x0DAC, 0x4E7A, 0xA8, 0x6C, 0xB2, 0x5C, 0xEE, 0xAA, 0x88, 0xF6); +DEFINE_GUID(GUID_IO_VOLUME_PHYSICAL_CONFIGURATION_CHANGE, + 0x2DE97F84, 0x4C06, 0x11D2, 0xA5, 0x32, 0x00, 0x60, 0x97, 0x13, 0x05, 0x5A); +DEFINE_GUID(GUID_IO_VOLUME_FVE_STATUS_CHANGE, + 0x062998B2, 0xEE1F, 0x4B6A, 0xB8, 0x57, 0xE7, 0x6C, 0xBB, 0xE9, 0xA6, 0xDA); +DEFINE_GUID(GUID_IO_VOLUME_DEVICE_INTERFACE, + 0x53F5630D, 0xB6BF, 0x11D0, 0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B); +DEFINE_GUID(GUID_IO_VOLUME_CHANGE_SIZE, + 0x3A1625BE, 0xAD03, 0x49F1, 0x8E, 0xF8, 0x6B, 0xBA, 0xC1, 0x82, 0xD1, 0xFD); +DEFINE_GUID(GUID_IO_MEDIA_ARRIVAL, + 0xD07433C0, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_MEDIA_REMOVAL, + 0xD07433C1, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_CDROM_EXCLUSIVE_LOCK, + 0xBC56C139, 0x7A10, 0x47EE, 0xA2, 0x94, 0x4C, 0x6A, 0x38, 0xF0, 0x14, 0x9A); +DEFINE_GUID(GUID_IO_CDROM_EXCLUSIVE_UNLOCK, + 0xA3B6D27D, 0x5E35, 0x4885, 0x81, 0xE5, 0xEE, 0x18, 0xC0, 0x0E, 0xD7, 0x79); +DEFINE_GUID(GUID_IO_DEVICE_BECOMING_READY, + 0xD07433F0, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_DEVICE_EXTERNAL_REQUEST, + 0xD07433D0, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_MEDIA_EJECT_REQUEST, + 0xD07433D1, 0xA98E, 0x11D2, 0x91, 0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3); +DEFINE_GUID(GUID_IO_DRIVE_REQUIRES_CLEANING, + 0x7207877C, 0x90ED, 0x44E5, 0xA0, 0x00, 0x81, 0x42, 0x8D, 0x4C, 0x79, 0xBB); +DEFINE_GUID(GUID_IO_TAPE_ERASE, + 0x852D11EB, 0x4BB8, 0x4507, 0x9D, 0x9B, 0x41, 0x7C, 0xC2, 0xB1, 0xB4, 0x38); +DEFINE_GUID(GUID_IO_DISK_CLONE_ARRIVAL, + 0x6A61885B, 0x7C39, 0x43DD, 0x9B, 0x56, 0xB8, 0xAC, 0x22, 0xA5, 0x49, 0xAA); +DEFINE_GUID(GUID_IO_DISK_LAYOUT_CHANGE, + 0x11DFF54C, 0x8469, 0x41F9, 0xB3, 0xDE, 0xEF, 0x83, 0x64, 0x87, 0xC5, 0x4A); Propchange: branches/pierre-fsd/include/psdk/ioevent.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/pierre-fsd/lib/sdk/ioevent/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Aug 26 16:37:27 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/pierre-fsd/lib/sdk/ioevent/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/pierre-fsd/lib/sdk/ioevent/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/pierre-fsd/lib/sdk/ioevent/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/pierre-fsd/lib/sdk/ioevent/ioevent.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/sdk/ioevent/ioev… ============================================================================== --- branches/pierre-fsd/lib/sdk/ioevent/ioevent.c (added) +++ branches/pierre-fsd/lib/sdk/ioevent/ioevent.c [iso-8859-1] Tue Aug 26 16:37:27 2008 @@ -1,0 +1,9 @@ + +#include <stdarg.h> + +#define COM_NO_WINDOWS_H +#include "initguid.h" + +#include <ioevent.h> + +/* EOF */ Propchange: branches/pierre-fsd/lib/sdk/ioevent/ioevent.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/pierre-fsd/lib/sdk/ioevent/ioevent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/sdk/ioevent/ioev… ============================================================================== --- branches/pierre-fsd/lib/sdk/ioevent/ioevent.rbuild (added) +++ branches/pierre-fsd/lib/sdk/ioevent/ioevent.rbuild [iso-8859-1] Tue Aug 26 16:37:27 2008 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ioevent" type="staticlibrary"> + <file>ioevent.c</file> +</module> Propchange: branches/pierre-fsd/lib/sdk/ioevent/ioevent.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/pierre-fsd/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/sdk/sdk.rbuild?r… ============================================================================== --- branches/pierre-fsd/lib/sdk/sdk.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/lib/sdk/sdk.rbuild [iso-8859-1] Tue Aug 26 16:37:27 2008 @@ -10,6 +10,9 @@ </directory> <directory name="nt"> <xi:include href="nt/nt.rbuild" /> + </directory> + <directory name="ioevent"> + <xi:include href="ioevent/ioevent.rbuild" /> </directory> <directory name="strmiids"> <xi:include href="strmiids/strmiids.rbuild" /> Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] Tue Aug 26 16:37:27 2008 @@ -3,12 +3,13 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/pnp.c * PURPOSE: Manages PnP support routines for file system drivers. - * PROGRAMMERS: None. + * PROGRAMMERS: heis_spiter(a)hotmail.com */ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> +#include <ioevent.h> #define NDEBUG #include <debug.h> @@ -16,17 +17,18 @@ /*++ * @name FsRtlNotifyVolumeEvent - * @unimplemented + * @implemented * - * FILLME + * Notifies system (and applications) that something changed on volume. + * FSD should call it each time volume status changes. * * @param FileObject - * FILLME + * FileObject for the volume * * @param EventCode - * FILLME + * Event that occurs one the volume * - * @return None + * @return STATUS_SUCCESS if notification went well * * @remarks Only present in NT 5+. * @@ -36,7 +38,69 @@ FsRtlNotifyVolumeEvent(IN PFILE_OBJECT FileObject, IN ULONG EventCode) { - /* Unimplemented */ - KEBUGCHECK(0); - return STATUS_NOT_IMPLEMENTED; + LPGUID Guid = NULL; + NTSTATUS Status = STATUS_SUCCESS; + PDEVICE_OBJECT DeviceObject = NULL; + TARGET_DEVICE_CUSTOM_NOTIFICATION Notification; + + DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (DeviceObject) + { + Notification.Version = 1; + Notification.Size = sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION); + /* MSDN says that FileObject must be null + when calling IoReportTargetDeviceChangeAsynchronous */ + Notification.FileObject = NULL; + Notification.NameBufferOffset = -1; + /* Find the good GUID associated with the event */ + switch (EventCode) + { + case FSRTL_VOLUME_DISMOUNT: + { + Guid = (LPGUID)&GUID_IO_VOLUME_DISMOUNT; + break; + } + case FSRTL_VOLUME_DISMOUNT_FAILED: + { + Guid = (LPGUID)&GUID_IO_VOLUME_DISMOUNT_FAILED; + break; + } + case FSRTL_VOLUME_LOCK: + { + Guid = (LPGUID)&GUID_IO_VOLUME_LOCK; + break; + } + case FSRTL_VOLUME_LOCK_FAILED: + { + Guid = (LPGUID)&GUID_IO_VOLUME_LOCK_FAILED; + break; + } + case FSRTL_VOLUME_MOUNT: + { + Guid = (LPGUID)&GUID_IO_VOLUME_MOUNT; + break; + } + case FSRTL_VOLUME_UNLOCK: + { + Guid = (LPGUID)&GUID_IO_VOLUME_UNLOCK; + break; + } + default: + { + Status = STATUS_INVALID_PARAMETER; + break; + } + } + if (Guid) + { + /* Copy GUID to notification structure and then report the change */ + RtlCopyMemory(&(Notification.Event), Guid, sizeof(GUID)); + IoReportTargetDeviceChangeAsynchronous(DeviceObject, + &Notification, + NULL, + NULL); + } + ObfDereferenceObject(DeviceObject); + } + return Status; } Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl-ge… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Aug 26 16:37:27 2008 @@ -32,6 +32,7 @@ <library>kdcom</library> <library>bootvid</library> <library>wdmguid</library> + <library>ioevent</library> <dependency>bugcodes</dependency> <directory name="include"> <pch>ntoskrnl.h</pch>

1 0

[janderwald] 35686: - Start implementing Network Connections Shell Folder - Rename cpanelfolder to shfldr_cpanel - Implement _ILIsNetConnect, ILCreateNetConnect
by janderwald＠svn.reactos.org 26 Aug '08

26 Aug '08

Author: janderwald Date: Tue Aug 26 16:29:55 2008 New Revision: 35686 URL: http://svn.reactos.org/svn/reactos?rev=35686&view=rev Log: - Start implementing Network Connections Shell Folder - Rename cpanelfolder to shfldr_cpanel - Implement _ILIsNetConnect, ILCreateNetConnect Added: trunk/reactos/dll/win32/shell32/shfldr_netconnect.c (with props) Removed: trunk/reactos/dll/win32/shell32/cpanelfolder.c Modified: trunk/reactos/dll/win32/shell32/classes.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/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/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shresdef.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… Removed: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… Added: trunk/reactos/dll/win32/shell32/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
86
Older →

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 August 2008