Author: akhaldi
Date: Fri Oct 31 15:16:51 2014
New Revision: 65147
URL: http://svn.reactos.org/svn/reactos?rev=65147&view=rev
Log:
[SHELL32]
* Rename shellstring.cpp to shellstring.c and update it against Wine 1.7.27.
CORE-8540
Added:
trunk/reactos/dll/win32/shell32/shellstring.c
- copied, changed from r65143,
trunk/reactos/dll/win32/shell32/shellstring.cpp
Removed:
trunk/reactos/dll/win32/shell32/shellstring.cpp
Modified:
trunk/reactos/dll/win32/shell32/CMakeLists.txt
trunk/reactos/dll/win32/shell32/shell32_main.h
Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLists.txt?rev=65147&r1=65146&r2=65147&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Oct 31
15:16:51 2014
@@ -42,7 +42,6 @@
shellord.cpp
shellpath.cpp
shellreg.cpp
- shellstring.cpp
folders/desktop.cpp
folders/fs.cpp
folders/mycomp.cpp
@@ -76,6 +75,7 @@
add_library(shell32 SHARED
${SOURCE}
+ shellstring.c
vista.c
shell32.rc
${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
Modified: trunk/reactos/dll/win32/shell32/shell32_main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_main.h?rev=65147&r1=65146&r2=65147&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Fri Oct 31
15:16:51 2014
@@ -30,7 +30,7 @@
extern HIMAGELIST ShellSmallIconList;
extern HIMAGELIST ShellBigIconList;
-extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST
* lpSmallList);
+BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST *
lpSmallList);
/* Iconcache */
#define INVALID_INDEX -1
@@ -128,7 +128,7 @@
void WINAPI _InsertMenuItemW (HMENU hmenu, UINT indexMenu, BOOL fByPosition,
UINT wID, UINT fType, LPCWSTR dwTypeData, UINT fState);
-static BOOL __inline SHELL_OsIsUnicode(void)
+static __inline BOOL SHELL_OsIsUnicode(void)
{
/* if high-bit of version is 0, we are emulating NT */
return !(GetVersion() & 0x80000000);
@@ -139,26 +139,26 @@
SHFree(*ptr); \
*ptr = NULL; \
};
-static void __inline __SHCloneStrA(char **target, const char *source)
+static __inline void __SHCloneStrA(char **target, const char *source)
{
*target = (char *)SHAlloc(strlen(source) + 1);
strcpy(*target, source);
}
-static void __inline __SHCloneStrWtoA(char **target, const WCHAR *source)
+static __inline void __SHCloneStrWtoA(char **target, const WCHAR *source)
{
int len = WideCharToMultiByte(CP_ACP, 0, source, -1, NULL, 0, NULL,
NULL);
*target = (char *)SHAlloc(len);
WideCharToMultiByte(CP_ACP, 0, source, -1, *target, len, NULL, NULL);
}
-static void __inline __SHCloneStrW(WCHAR **target, const WCHAR *source)
+static __inline void __SHCloneStrW(WCHAR **target, const WCHAR *source)
{
*target = (WCHAR *)SHAlloc((lstrlenW(source) + 1) * sizeof(WCHAR) );
lstrcpyW(*target, source);
}
-static LPWSTR __inline __SHCloneStrAtoW(WCHAR **target, const char *source)
+static __inline LPWSTR __SHCloneStrAtoW(WCHAR **target, const char *source)
{
int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0);
*target = (WCHAR *)SHAlloc(len * sizeof(WCHAR));
Copied: trunk/reactos/dll/win32/shell32/shellstring.c (from r65143,
trunk/reactos/dll/win32/shell32/shellstring.cpp)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellstring.c?p2=trunk/reactos/dll/win32/shell32/shellstring.c&p1=trunk/reactos/dll/win32/shell32/shellstring.cpp&r1=65143&r2=65147&rev=65147&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellstring.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellstring.c [iso-8859-1] Fri Oct 31
15:16:51 2014
@@ -16,43 +16,64 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "precomp.h"
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <wine/unicode.h>
+#include <wine/debug.h>
+
+#include "shell32_main.h"
+#include "undocshell.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/************************* STRRET functions ****************************/
+static const char *debugstr_strret(STRRET *s)
+{
+ switch (s->uType)
+ {
+ case STRRET_WSTR:
+ return "STRRET_WSTR";
+ case STRRET_CSTR:
+ return "STRRET_CSTR";
+ case STRRET_OFFSET:
+ return "STRRET_OFFSET";
+ default:
+ return "STRRET_???";
+ }
+}
+
BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const
ITEMIDLIST *pidl)
{
- TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n",
- dest,len,src,
- (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
- (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
- (src->uType == STRRET_OFFSET) ? "STRRET_OFFSET" : "STRRET_???",
- pidl);
+ TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest, len, src,
debugstr_strret(src), pidl);
if (!dest)
return FALSE;
switch (src->uType)
{
- case STRRET_WSTR:
- WideCharToMultiByte(CP_ACP, 0, src->pOleStr, -1, dest, len, NULL,
NULL);
- CoTaskMemFree(src->pOleStr);
- break;
-
- case STRRET_CSTR:
- lstrcpynA(dest, src->cStr, len);
- break;
-
- case STRRET_OFFSET:
- lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->uOffset, len);
- break;
-
- default:
- FIXME("unknown type!\n");
- if (len) *dest = '\0';
- return FALSE;
+ case STRRET_WSTR:
+ WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, dest, len,
NULL, NULL);
+ CoTaskMemFree(src->u.pOleStr);
+ break;
+ case STRRET_CSTR:
+ lstrcpynA(dest, src->u.cStr, len);
+ break;
+ case STRRET_OFFSET:
+ lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+ break;
+ default:
+ FIXME("unknown type %u!\n", src->uType);
+ if (len)
+ *dest = '\0';
+ return FALSE;
}
TRACE("-- %s\n", debugstr_a(dest) );
return TRUE;
@@ -62,139 +83,133 @@
BOOL WINAPI StrRetToStrNW(LPWSTR dest, DWORD len, LPSTRRET src, const
ITEMIDLIST *pidl)
{
- TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n",
- dest,len,src,
- (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
- (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
- (src->uType == STRRET_OFFSET) ? "STRRET_OFFSET" : "STRRET_???",
- pidl);
+ TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest, len, src,
debugstr_strret(src), pidl);
if (!dest)
return FALSE;
switch (src->uType)
{
- case STRRET_WSTR:
- lstrcpynW(dest, src->pOleStr, len);
- CoTaskMemFree(src->pOleStr);
- break;
-
- case STRRET_CSTR:
- if (!MultiByteToWideChar( CP_ACP, 0, src->cStr, -1, dest, len ) &&
len)
- dest[len-1] = 0;
- break;
-
- case STRRET_OFFSET:
- if (!MultiByteToWideChar( CP_ACP, 0,
((LPCSTR)&pidl->mkid)+src->uOffset, -1, dest, len ) && len)
- dest[len-1] = 0;
- break;
-
- default:
- FIXME("unknown type!\n");
- if (len) *dest = '\0';
- return FALSE;
+ case STRRET_WSTR:
+ lstrcpynW(dest, src->u.pOleStr, len);
+ CoTaskMemFree(src->u.pOleStr);
+ break;
+ case STRRET_CSTR:
+ if (!MultiByteToWideChar(CP_ACP, 0, src->u.cStr, -1, dest, len) &&
len)
+ dest[len-1] = 0;
+ break;
+ case STRRET_OFFSET:
+ if (!MultiByteToWideChar(CP_ACP, 0,
((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, dest, len)
+ && len)
+ dest[len-1] = 0;
+ break;
+ default:
+ FIXME("unknown type %u!\n", src->uType);
+ if (len)
+ *dest = '\0';
+ return FALSE;
}
return TRUE;
}
/*************************************************************************
- * StrRetToStrN [SHELL32.96]
+ * StrRetToStrN [SHELL32.96]
*
* converts a STRRET to a normal string
*
* NOTES
* the pidl is for STRRET OFFSET
*/
-EXTERN_C BOOL WINAPI StrRetToStrNAW(LPVOID dest, DWORD len, LPSTRRET src,
const ITEMIDLIST *pidl)
+BOOL WINAPI StrRetToStrNAW(LPVOID dest, DWORD len, LPSTRRET src, const
ITEMIDLIST *pidl)
{
if(SHELL_OsIsUnicode())
- return StrRetToStrNW((LPWSTR)dest, len, src, pidl);
+ return StrRetToStrNW(dest, len, src, pidl);
else
- return StrRetToStrNA((LPSTR)dest, len, src, pidl);
+ return StrRetToStrNA(dest, len, src, pidl);
}
/************************* OLESTR functions ****************************/
/************************************************************************
- * StrToOleStr [SHELL32.163]
+ * StrToOleStr [SHELL32.163]
*
*/
static int StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
{
- TRACE("(%p, %p %s)\n",
- lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
-
- return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr,
MAX_PATH);
+ TRACE("(%p, %p %s)\n",
+ lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
+
+ return MultiByteToWideChar(CP_ACP, 0, lpMultiByteString, -1,
lpWideCharStr, MAX_PATH);
}
static int StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString)
{
- TRACE("(%p, %p %s)\n",
- lpWideCharStr, lpWString, debugstr_w(lpWString));
-
- wcscpy (lpWideCharStr, lpWString );
- return wcslen(lpWideCharStr);
-}
-
-EXTERN_C BOOL WINAPI StrToOleStrAW (LPWSTR lpWideCharStr, LPCVOID lpString)
-{
- if (SHELL_OsIsUnicode())
- return StrToOleStrW (lpWideCharStr, (LPCWSTR)lpString);
- return StrToOleStrA (lpWideCharStr, (LPCSTR)lpString);
-}
-
-/*************************************************************************
- * StrToOleStrN [SHELL32.79]
+ TRACE("(%p, %p %s)\n",
+ lpWideCharStr, lpWString, debugstr_w(lpWString));
+
+ strcpyW (lpWideCharStr, lpWString );
+ return strlenW(lpWideCharStr);
+}
+
+BOOL WINAPI StrToOleStrAW (LPWSTR lpWideCharStr, LPCVOID lpString)
+{
+ if (SHELL_OsIsUnicode())
+ return StrToOleStrW (lpWideCharStr, lpString);
+ return StrToOleStrA (lpWideCharStr, lpString);
+}
+
+/*************************************************************************
+ * StrToOleStrN [SHELL32.79]
* lpMulti, nMulti, nWide [IN]
* lpWide [OUT]
*/
static BOOL StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr)
{
- TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr);
- return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide);
+ TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr),
nStr);
+ return MultiByteToWideChar (CP_ACP, 0, lpStrA, nStr, lpWide, nWide);
}
static BOOL StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr)
{
- TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr),
nStr);
-
- if (lstrcpynW (lpWide, lpStrW, nWide))
- { return wcslen (lpWide);
- }
- return 0;
-}
-
-EXTERN_C BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr,
INT nStr)
-{
- if (SHELL_OsIsUnicode())
- return StrToOleStrNW (lpWide, nWide, (LPCWSTR)lpStr, nStr);
- return StrToOleStrNA (lpWide, nWide, (LPCSTR)lpStr, nStr);
-}
-
-/*************************************************************************
- * OleStrToStrN [SHELL32.78]
+ TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr),
nStr);
+
+ if (lstrcpynW (lpWide, lpStrW, nWide))
+ { return lstrlenW (lpWide);
+ }
+ return FALSE;
+}
+
+BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, INT nStr)
+{
+ if (SHELL_OsIsUnicode())
+ return StrToOleStrNW (lpWide, nWide, lpStr, nStr);
+ return StrToOleStrNA (lpWide, nWide, lpStr, nStr);
+}
+
+/*************************************************************************
+ * OleStrToStrN [SHELL32.78]
*/
static BOOL OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle)
{
- TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle);
- return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL);
+ TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle);
+ return WideCharToMultiByte (CP_ACP, 0, lpOle, nOle, lpStr, nStr, NULL,
NULL);
}
static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle)
{
- TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle);
-
- if (lstrcpynW ( lpwStr, lpOle, nwStr))
- { return wcslen (lpwStr);
- }
- return 0;
-}
-
-EXTERN_C BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT
nIn)
-{
- if (SHELL_OsIsUnicode())
- return OleStrToStrNW ((LPWSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
- return OleStrToStrNA ((LPSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
+ TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle),
nOle);
+
+ if (lstrcpynW ( lpwStr, lpOle, nwStr))
+ { return lstrlenW (lpwStr);
+ }
+ return FALSE;
+}
+
+BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn)
+{
+ if (SHELL_OsIsUnicode())
+ return OleStrToStrNW (lpOut, nOut, lpIn, nIn);
+ return OleStrToStrNA (lpOut, nOut, lpIn, nIn);
}
@@ -212,25 +227,25 @@
* length of actual string
*
* NOTES
- * Not really sure if this function returns actually a value at all.
+ * Not really sure if this function returns actually a value at all.
*/
DWORD WINAPI CheckEscapesA(
- LPSTR string, /* [I/O] string to check ??*/
- DWORD len) /* [I] is 0 */
-{
- LPWSTR wString;
- DWORD ret = 0;
-
- TRACE("(%s %d)\n", debugstr_a(string), len);
- wString = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR));
- if (wString)
- {
- MultiByteToWideChar(CP_ACP, 0, string, len, wString, len);
- ret = CheckEscapesW(wString, len);
- WideCharToMultiByte(CP_ACP, 0, wString, len, string, len, NULL, NULL);
- LocalFree(wString);
- }
- return ret;
+ LPSTR string, /* [I/O] string to check ??*/
+ DWORD len) /* [I] is 0 */
+{
+ LPWSTR wString;
+ DWORD ret = 0;
+
+ TRACE("(%s %d)\n", debugstr_a(string), len);
+ wString = LocalAlloc(LPTR, len * sizeof(WCHAR));
+ if (wString)
+ {
+ MultiByteToWideChar(CP_ACP, 0, string, len, wString, len);
+ ret = CheckEscapesW(wString, len);
+ WideCharToMultiByte(CP_ACP, 0, wString, len, string, len, NULL, NULL);
+ LocalFree(wString);
+ }
+ return ret;
}
static const WCHAR strEscapedChars[] = {' ','"',',',';','^',0};
@@ -241,24 +256,24 @@
* See CheckEscapesA.
*/
DWORD WINAPI CheckEscapesW(
- LPWSTR string,
- DWORD len)
-{
- DWORD size = wcslen(string);
- LPWSTR s, d;
-
- TRACE("(%s %d) stub\n", debugstr_w(string), len);
-
- if (StrPBrkW(string, strEscapedChars) && size + 2 <= len)
- {
- s = &string[size - 1];
- d = &string[size + 2];
- *d-- = 0;
- *d-- = '"';
- for (;d > string;)
- *d-- = *s--;
- *d = '"';
- return size + 2;
- }
- return size;
-}
+ LPWSTR string,
+ DWORD len)
+{
+ DWORD size = lstrlenW(string);
+ LPWSTR s, d;
+
+ TRACE("(%s %d) stub\n", debugstr_w(string), len);
+
+ if (StrPBrkW(string, strEscapedChars) && size + 2 <= len)
+ {
+ s = &string[size - 1];
+ d = &string[size + 2];
+ *d-- = 0;
+ *d-- = '"';
+ for (;d > string;)
+ *d-- = *s--;
+ *d = '"';
+ return size + 2;
+ }
+ return size;
+}
Removed: trunk/reactos/dll/win32/shell32/shellstring.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellstring.cpp?rev=65146
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellstring.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellstring.cpp (removed)
@@ -1,264 +0,0 @@
-/*
- * Copyright 2000 Juergen Schmied
- *
- * 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);
-
-/************************* STRRET functions ****************************/
-
-BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const
ITEMIDLIST *pidl)
-{
- TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n",
- dest,len,src,
- (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
- (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
- (src->uType == STRRET_OFFSET) ? "STRRET_OFFSET" : "STRRET_???",
- pidl);
-
- if (!dest)
- return FALSE;
-
- switch (src->uType)
- {
- case STRRET_WSTR:
- WideCharToMultiByte(CP_ACP, 0, src->pOleStr, -1, dest, len, NULL,
NULL);
- CoTaskMemFree(src->pOleStr);
- break;
-
- case STRRET_CSTR:
- lstrcpynA(dest, src->cStr, len);
- break;
-
- case STRRET_OFFSET:
- lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->uOffset, len);
- break;
-
- default:
- FIXME("unknown type!\n");
- if (len) *dest = '\0';
- return FALSE;
- }
- TRACE("-- %s\n", debugstr_a(dest) );
- return TRUE;
-}
-
-/************************************************************************/
-
-BOOL WINAPI StrRetToStrNW(LPWSTR dest, DWORD len, LPSTRRET src, const
ITEMIDLIST *pidl)
-{
- TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n",
- dest,len,src,
- (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
- (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
- (src->uType == STRRET_OFFSET) ? "STRRET_OFFSET" : "STRRET_???",
- pidl);
-
- if (!dest)
- return FALSE;
-
- switch (src->uType)
- {
- case STRRET_WSTR:
- lstrcpynW(dest, src->pOleStr, len);
- CoTaskMemFree(src->pOleStr);
- break;
-
- case STRRET_CSTR:
- if (!MultiByteToWideChar( CP_ACP, 0, src->cStr, -1, dest, len ) &&
len)
- dest[len-1] = 0;
- break;
-
- case STRRET_OFFSET:
- if (!MultiByteToWideChar( CP_ACP, 0,
((LPCSTR)&pidl->mkid)+src->uOffset, -1, dest, len ) && len)
- dest[len-1] = 0;
- break;
-
- default:
- FIXME("unknown type!\n");
- if (len) *dest = '\0';
- return FALSE;
- }
- return TRUE;
-}
-
-
-/*************************************************************************
- * StrRetToStrN [SHELL32.96]
- *
- * converts a STRRET to a normal string
- *
- * NOTES
- * the pidl is for STRRET OFFSET
- */
-EXTERN_C BOOL WINAPI StrRetToStrNAW(LPVOID dest, DWORD len, LPSTRRET src,
const ITEMIDLIST *pidl)
-{
- if(SHELL_OsIsUnicode())
- return StrRetToStrNW((LPWSTR)dest, len, src, pidl);
- else
- return StrRetToStrNA((LPSTR)dest, len, src, pidl);
-}
-
-/************************* OLESTR functions ****************************/
-
-/************************************************************************
- * StrToOleStr [SHELL32.163]
- *
- */
-static int StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
-{
- TRACE("(%p, %p %s)\n",
- lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
-
- return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr,
MAX_PATH);
-
-}
-static int StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString)
-{
- TRACE("(%p, %p %s)\n",
- lpWideCharStr, lpWString, debugstr_w(lpWString));
-
- wcscpy (lpWideCharStr, lpWString );
- return wcslen(lpWideCharStr);
-}
-
-EXTERN_C BOOL WINAPI StrToOleStrAW (LPWSTR lpWideCharStr, LPCVOID lpString)
-{
- if (SHELL_OsIsUnicode())
- return StrToOleStrW (lpWideCharStr, (LPCWSTR)lpString);
- return StrToOleStrA (lpWideCharStr, (LPCSTR)lpString);
-}
-
-/*************************************************************************
- * StrToOleStrN [SHELL32.79]
- * lpMulti, nMulti, nWide [IN]
- * lpWide [OUT]
- */
-static BOOL StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr)
-{
- TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr);
- return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide);
-}
-static BOOL StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr)
-{
- TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr),
nStr);
-
- if (lstrcpynW (lpWide, lpStrW, nWide))
- { return wcslen (lpWide);
- }
- return 0;
-}
-
-EXTERN_C BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr,
INT nStr)
-{
- if (SHELL_OsIsUnicode())
- return StrToOleStrNW (lpWide, nWide, (LPCWSTR)lpStr, nStr);
- return StrToOleStrNA (lpWide, nWide, (LPCSTR)lpStr, nStr);
-}
-
-/*************************************************************************
- * OleStrToStrN [SHELL32.78]
- */
-static BOOL OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle)
-{
- TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle);
- return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL);
-}
-
-static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle)
-{
- TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle);
-
- if (lstrcpynW ( lpwStr, lpOle, nwStr))
- { return wcslen (lpwStr);
- }
- return 0;
-}
-
-EXTERN_C BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT
nIn)
-{
- if (SHELL_OsIsUnicode())
- return OleStrToStrNW ((LPWSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
- return OleStrToStrNA ((LPSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
-}
-
-
-/*************************************************************************
- * CheckEscapesA [SHELL32.@]
- *
- * Checks a string for special characters which are not allowed in a path
- * and encloses it in quotes if that is the case.
- *
- * PARAMS
- * string [I/O] string to check and on return eventually quoted
- * len [I] length of string
- *
- * RETURNS
- * length of actual string
- *
- * NOTES
- * Not really sure if this function returns actually a value at all.
- */
-DWORD WINAPI CheckEscapesA(
- LPSTR string, /* [I/O] string to check ??*/
- DWORD len) /* [I] is 0 */
-{
- LPWSTR wString;
- DWORD ret = 0;
-
- TRACE("(%s %d)\n", debugstr_a(string), len);
- wString = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR));
- if (wString)
- {
- MultiByteToWideChar(CP_ACP, 0, string, len, wString, len);
- ret = CheckEscapesW(wString, len);
- WideCharToMultiByte(CP_ACP, 0, wString, len, string, len, NULL, NULL);
- LocalFree(wString);
- }
- return ret;
-}
-
-static const WCHAR strEscapedChars[] = {' ','"',',',';','^',0};
-
-/*************************************************************************
- * CheckEscapesW [SHELL32.@]
- *
- * See CheckEscapesA.
- */
-DWORD WINAPI CheckEscapesW(
- LPWSTR string,
- DWORD len)
-{
- DWORD size = wcslen(string);
- LPWSTR s, d;
-
- TRACE("(%s %d) stub\n", debugstr_w(string), len);
-
- if (StrPBrkW(string, strEscapedChars) && size + 2 <= len)
- {
- s = &string[size - 1];
- d = &string[size + 2];
- *d-- = 0;
- *d-- = '"';
- for (;d > string;)
- *d-- = *s--;
- *d = '"';
- return size + 2;
- }
- return size;
-}
