commit d07c1004e3345d469e0b7f33b64e0797132f6651
author Alexandre Julliard <julliard@winehq.org> Fri Jan 23 22:51:41 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 23 22:51:41 2004 +0000
tree 981bbf80c6f8a21a0c4d1648348795b162e2e6bf
parent 23be696d40981f7eeee60a49a2e31435d259d9ff

Moved a few remaining 16-bit definitions out of the standard headers.

include/objbase.h

diff --git a/include/objbase.h b/include/objbase.h
index 121a6c3..cd39ded 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -412,7 +412,7 @@
 HRESULT WINAPI CoCopyProxy(IUnknown* pProxy, IUnknown** ppCopy);
 
 HRESULT WINAPI CoImpersonateClient(void);
-HRESULT WINAPI CoQueryClientBlanket(DWORD* pAuthnSvc, DWORD* pAuthzSvc, OLECHAR16** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTHZ_HANDLE* pPrivs, DWORD* pCapabilities);
+HRESULT WINAPI CoQueryClientBlanket(DWORD* pAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTHZ_HANDLE* pPrivs, DWORD* pCapabilities);
 HRESULT WINAPI CoRevertToSelf(void);
 
 /* misc */
@@ -430,15 +430,9 @@
 /*****************************************************************************
  *	GUID API
  */
-HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*);
 HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*);
-
-HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *);
 HRESULT WINAPI CLSIDFromString(LPOLESTR, CLSID *);
-
-HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);
 HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid);
-
 HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID);
 
 INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
@@ -460,13 +454,10 @@
  */
 HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid);
 
-HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC* ppbc);
 HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc);
 
-HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName, LPMONIKER* ppmk);
 HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER* ppmk);
 
-HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim, LPCOLESTR  lpszItem, LPMONIKER* ppmk);
 HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR  lpszItem, LPMONIKER* ppmk);
 
 HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk);
@@ -482,7 +473,6 @@
 HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon);
 
 HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
-HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
 
 /*****************************************************************************
  *	Storage API