Ignore:
Timestamp:
Sep 15, 2001, 11:26:26 AM (24 years ago)
Author:
sandervl
Message:

restored old version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/shell32/shellstring.c

    r6650 r6709  
    1 /* $Id: shellstring.c,v 1.3 2001-09-05 13:46:58 bird Exp $ */
    21#include <string.h>
    32#include <stdio.h>
    43#include <ctype.h>
    5 #include <stdlib.h>
     4#include <stdlib.h> 
    65
    76#include "winnls.h"
     
    2221
    2322/*************************************************************************
    24  * StrRetToStrN                 [SHELL32.96]
    25  *
     23 * StrRetToStrN                                 [SHELL32.96]
     24 * 
    2625 * converts a STRRET to a normal string
    2726 *
     
    4140HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
    4241{
    43     if(SHELL_OsIsUnicode())
    44       return StrRetToStrNW (dest, len, src, pidl);
    45     return StrRetToStrNA (dest, len, src, pidl);
     42        if(SHELL_OsIsUnicode())
     43          return StrRetToStrNW (dest, len, src, pidl);
     44        return StrRetToStrNA (dest, len, src, pidl);
    4645}
    4746
     
    4948
    5049/************************************************************************
    51  *  StrToOleStr         [SHELL32.163]
     50 *      StrToOleStr                     [SHELL32.163]
    5251 *
    5352 */
    5453int WINAPI StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
    5554{
    56     TRACE("(%p, %p %s)\n",
    57     lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
     55        TRACE("(%p, %p %s)\n",
     56        lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
    5857
    59     return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr, MAX_PATH);
     58        return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr, MAX_PATH);
    6059
    6160}
    6261int WINAPI StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString)
    6362{
    64     TRACE("(%p, %p %s)\n",
    65     lpWideCharStr, lpWString, debugstr_w(lpWString));
     63        TRACE("(%p, %p %s)\n",
     64        lpWideCharStr, lpWString, debugstr_w(lpWString));
    6665
    67     strcpyW (lpWideCharStr, lpWString );
    68     return strlenW(lpWideCharStr);
     66        strcpyW (lpWideCharStr, lpWString );
     67        return strlenW(lpWideCharStr);
    6968}
    7069
    7170BOOL WINAPI StrToOleStrAW (LPWSTR lpWideCharStr, LPCVOID lpString)
    7271{
    73     if (SHELL_OsIsUnicode())
    74       return StrToOleStrW (lpWideCharStr, lpString);
    75     return StrToOleStrA (lpWideCharStr, lpString);
     72        if (SHELL_OsIsUnicode())
     73          return StrToOleStrW (lpWideCharStr, lpString);
     74        return StrToOleStrA (lpWideCharStr, lpString);
    7675}
    7776
    7877/*************************************************************************
    79  * StrToOleStrN                 [SHELL32.79]
     78 * StrToOleStrN                                 [SHELL32.79]
    8079 *  lpMulti, nMulti, nWide [IN]
    8180 *  lpWide [OUT]
    8281 */
    83 BOOL WINAPI StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr)
     82BOOL WINAPI StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr) 
    8483{
    85     TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr);
    86     return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide);
     84        TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr);
     85        return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide);
    8786}
    88 BOOL WINAPI StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr)
     87BOOL WINAPI StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr) 
    8988{
    90     TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr), nStr);
     89        TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr), nStr);
    9190
    92     if (lstrcpynW (lpWide, lpStrW, nWide))
    93     { return lstrlenW (lpWide);
    94     }
    95     return 0;
     91        if (lstrcpynW (lpWide, lpStrW, nWide))
     92        { return lstrlenW (lpWide);
     93        }
     94        return 0;
    9695}
    9796
    98 BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, INT nStr)
     97BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, INT nStr) 
    9998{
    100     if (SHELL_OsIsUnicode())
    101       return StrToOleStrNW (lpWide, nWide, lpStr, nStr);
    102     return StrToOleStrNA (lpWide, nWide, lpStr, nStr);
     99        if (SHELL_OsIsUnicode())
     100          return StrToOleStrNW (lpWide, nWide, lpStr, nStr);
     101        return StrToOleStrNA (lpWide, nWide, lpStr, nStr);
    103102}
    104103
    105104/*************************************************************************
    106  * OleStrToStrN                 [SHELL32.78]
     105 * OleStrToStrN                                 [SHELL32.78]
    107106 */
    108 BOOL WINAPI OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle)
     107BOOL WINAPI OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle) 
    109108{
    110     TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle);
    111     return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL);
     109        TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle);
     110        return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL);
    112111}
    113112
    114 BOOL WINAPI OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle)
     113BOOL WINAPI OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle) 
    115114{
    116     TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle);
     115        TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle);
    117116
    118     if (lstrcpynW ( lpwStr, lpOle, nwStr))
    119     { return lstrlenW (lpwStr);
    120     }
    121     return 0;
     117        if (lstrcpynW ( lpwStr, lpOle, nwStr))
     118        { return lstrlenW (lpwStr);
     119        }
     120        return 0;
    122121}
    123122
    124 BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn)
     123BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn) 
    125124{
    126     if (SHELL_OsIsUnicode())
    127       return OleStrToStrNW (lpOut, nOut, lpIn, nIn);
    128     return OleStrToStrNA (lpOut, nOut, lpIn, nIn);
     125        if (SHELL_OsIsUnicode())
     126          return OleStrToStrNW (lpOut, nOut, lpIn, nIn);
     127        return OleStrToStrNA (lpOut, nOut, lpIn, nIn);
    129128}
Note: See TracChangeset for help on using the changeset viewer.