Changeset 869


Ignore:
Timestamp:
Sep 8, 1999, 12:34:32 PM (26 years ago)
Author:
phaller
Message:

Fix: exported CLSIDFromStringA as replacement for CLSIDFromString16

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/changelog

    r868 r869  
    1  /* $Id: changelog,v 1.181 1999-09-08 07:46:52 sandervl Exp $ */
     1 /* $Id: changelog,v 1.182 1999-09-08 10:32:18 phaller Exp $ */
     2
     3 99-09-08: Patrick Haller <phaller@gmx.net>
     4        - OLE32: CLSIDFromStringA is needed in other modules, too. (SHELL32)
    25
    36 99-09-08: Sander van Leeuwen <sandervl@xs4all.nl>

  • trunk/include/win/wine/obj_base.h

    r856 r869  
    1 /* $Id: obj_base.h,v 1.10 1999-09-07 17:54:57 phaller Exp $ */
     1/* $Id: obj_base.h,v 1.11 1999-09-08 10:34:32 phaller Exp $ */
    22/*
    33 * This file defines the macros and types necessary to define COM interfaces,
    … …  
    6060HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *);
    6161HRESULT WINAPI CLSIDFromString(LPCOLESTR, CLSID *);
     62HRESULT WINAPI CLSIDFromStringA(LPSTR, CLSID *);
    6263
    6364HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);

  • trunk/src/ole32/clsid.cpp

    r856 r869  
    6363    return CLSIDFromString((LPCOLESTR)lpsz, (LPCLSID)lpiid);
    6464}
     65
     66
     67// ----------------------------------------------------------------------
     68// CLSIDFromStringA()
     69// @@@PH: this is not a WINE API, but a replacement for CLSIDFromString16
     70//        which used to accept ASCII strings instead of OLE strings
     71// ----------------------------------------------------------------------
     72
     73// missing prototype
     74LPWSTR WIN32API HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
     75
     76HRESULT WIN32API CLSIDFromStringA(
     77    LPSTR               lpsz,           // [in] - ASCII string CLSID
     78    LPCLSID             pclsid)         // [out] - Binary CLSID
     79{
     80  LPWSTR  lpszOle = HEAP_strdupAtoW(GetProcessHeap(),
     81                                    0,
     82                                    lpsz);
     83  HRESULT hRes;
     84
     85  dprintf(("OLE32: CLSIDFromStringA"));
     86
     87  hRes = CLSIDFromString(lpszOle, pclsid);
     88  HeapFree(GetProcessHeap(), 0, lpszOle);
     89  return hRes;
     90}
     91
    6592
    6693// ----------------------------------------------------------------------

  • trunk/src/ole32/ole32.def

    r856 r869  
    183183;
    184184    WINE_StringFromCLSID       = _WINE_StringFromCLSID@8     @1000
     185    CLSIDFromStringA           = _CLSIDFromStringA@8         @1001
    185186

  • trunk/src/ole32/ole32exp.def

    r856 r869  
    165165    _WriteStringStream@0                      @162
    166166    _WINE_StringFromCLSID@8                   @1000
     167    _CLSIDFromStringA@8                       @1001
Note: See TracChangeset for help on using the changeset viewer.