From c86fef8844edc79b6e17714cee10a2f20a2407b8 Mon Sep 17 00:00:00 2001 From: Robert Shearman Date: Sun, 25 Sep 2005 15:17:10 +0000 Subject: [PATCH] Move all 16-bit functions to an appropriate 16-bit file. --- dlls/ole32/bindctx.c | 9 ----- dlls/ole32/clipboard.c | 10 ------ dlls/ole32/compobj.c | 82 +++------------------------------------------- dlls/ole32/moniker.c | 10 ------ dlls/ole32/ole16.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole2.c | 16 --------- dlls/ole32/ole2_16.c | 36 ++++++++++++++++++++ dlls/ole32/ole2stubs.c | 27 --------------- 8 files changed, 129 insertions(+), 150 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 6b427f4dd61..59990792e0c 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -526,15 +526,6 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) } /****************************************************************************** - * CreateBindCtx16 - ******************************************************************************/ -HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC * ppbc) -{ - FIXME("(%ld,%p),stub!\n",reserved,ppbc); - return E_NOTIMPL; -} - -/****************************************************************************** * CreateBindCtx (OLE32.@) ******************************************************************************/ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 75b706dc142..06ffba67ff9 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -478,16 +478,6 @@ HRESULT WINAPI OleGetClipboard(IDataObject** ppDataObj) return hr; } -/*********************************************************************** - * OleFlushClipboard [OLE2.76] - */ - -HRESULT WINAPI OleFlushClipboard16(void) -{ - return OleFlushClipboard(); -} - - /****************************************************************************** * OleFlushClipboard [OLE32.@] * Renders the data from the source IDataObject into the windows clipboard diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 62740f62f67..2202bd896ac 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -56,24 +56,20 @@ #include "windef.h" #include "winbase.h" +#include "winerror.h" +#include "winreg.h" #include "winuser.h" #include "objbase.h" #include "ole2.h" #include "ole2ver.h" -#include "rpc.h" -#include "winerror.h" -#include "winreg.h" -#include "wownt32.h" -#include "wine/unicode.h" -#include "objbase.h" + #include "compobj_private.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -typedef LPCSTR LPCOLESTR16; - HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) @@ -1048,42 +1044,6 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID) } /****************************************************************************** - * CLSIDFromProgID [COMPOBJ.61] - * - * Converts a program ID into the respective GUID. - * - * PARAMS - * progid [I] program id as found in registry - * riid [O] associated CLSID - * - * RETURNS - * Success: S_OK - * Failure: CO_E_CLASSSTRING - the given ProgID cannot be found. - */ -HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) -{ - char *buf,buf2[80]; - LONG buf2len; - HRESULT err; - HKEY xhkey; - - buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8); - sprintf(buf,"%s\\CLSID",progid); - if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) { - HeapFree(GetProcessHeap(),0,buf); - return CO_E_CLASSSTRING; - } - HeapFree(GetProcessHeap(),0,buf); - buf2len = sizeof(buf2); - if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) { - RegCloseKey(xhkey); - return CO_E_CLASSSTRING; - } - RegCloseKey(xhkey); - return __CLSIDFromStringA(buf2,riid); -} - -/****************************************************************************** * CLSIDFromProgID [OLE32.@] * * Converts a program id into the respective GUID. @@ -1123,7 +1083,6 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid) } - /***************************************************************************** * CoGetPSClsid [OLE32.@] * @@ -1671,22 +1630,6 @@ HRESULT WINAPI CoGetClassObject( } /*********************************************************************** - * CoGetClassObject [COMPOBJ.7] - * - */ -HRESULT WINAPI CoGetClassObject16( - REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, - REFIID iid, LPVOID *ppv) -{ - FIXME(", stub!\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); - - if (pServerInfo) { - FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); - FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); - } - return E_NOTIMPL; -} -/*********************************************************************** * CoResumeClassObjects (OLE32.@) * * Resumes all class objects registered with REGCLS_SUSPENDED. @@ -1863,23 +1806,6 @@ HRESULT WINAPI CoCreateInstance( } /*********************************************************************** - * CoCreateInstance [COMPOBJ.13] - */ -HRESULT WINAPI CoCreateInstance16( - REFCLSID rclsid, - LPUNKNOWN pUnkOuter, - DWORD dwClsContext, - REFIID iid, - LPVOID *ppv) -{ - FIXME("(%s, %p, %lx, %s, %p), stub!\n", - debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), - ppv - ); - return E_NOTIMPL; -} - -/*********************************************************************** * CoCreateInstanceEx [OLE32.@] */ HRESULT WINAPI CoCreateInstanceEx( diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 216317fd079..a7425f13002 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -641,16 +641,6 @@ RunningObjectTableImpl_EnumRunning(IRunningObjectTable* iface, return hr; } -/****************************************************************************** - * GetRunningObjectTable (OLE2.30) - */ -HRESULT WINAPI -GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) -{ - FIXME("(%ld,%p),stub!\n",reserved,pprot); - return E_NOTIMPL; -} - /*********************************************************************** * GetRunningObjectTable (OLE32.@) */ diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index 4beb8e6e74e..64f5a250d93 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -517,3 +517,92 @@ SEGPTR WINAPI CoMemAlloc(DWORD size, DWORD dwMemContext, DWORD x) { return (SEGPTR)0; return segptr; } + +/****************************************************************************** + * CLSIDFromProgID [COMPOBJ.61] + * + * Converts a program ID into the respective GUID. + * + * PARAMS + * progid [I] program id as found in registry + * riid [O] associated CLSID + * + * RETURNS + * Success: S_OK + * Failure: CO_E_CLASSSTRING - the given ProgID cannot be found. + */ +HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) +{ + char *buf,buf2[80]; + LONG buf2len; + HRESULT err; + HKEY xhkey; + + buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8); + sprintf(buf,"%s\\CLSID",progid); + if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) { + HeapFree(GetProcessHeap(),0,buf); + return CO_E_CLASSSTRING; + } + HeapFree(GetProcessHeap(),0,buf); + buf2len = sizeof(buf2); + if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) { + RegCloseKey(xhkey); + return CO_E_CLASSSTRING; + } + RegCloseKey(xhkey); + return __CLSIDFromStringA(buf2,riid); +} + +/*********************************************************************** + * CoGetClassObject [COMPOBJ.7] + * + */ +HRESULT WINAPI CoGetClassObject16( + REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, + REFIID iid, LPVOID *ppv) +{ + FIXME(", stub!\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + + if (pServerInfo) { + FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); + FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); + } + return E_NOTIMPL; +} + +/*********************************************************************** + * CoCreateInstance [COMPOBJ.13] + */ +HRESULT WINAPI CoCreateInstance16( + REFCLSID rclsid, + LPUNKNOWN pUnkOuter, + DWORD dwClsContext, + REFIID iid, + LPVOID *ppv) +{ + FIXME("(%s, %p, %lx, %s, %p), stub!\n", + debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), + ppv + ); + return E_NOTIMPL; +} + +/*********************************************************************** + * DllGetClassObject [OLE2.4] + */ +HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return E_NOTIMPL; +} + +/****************************************************************************** + * GetRunningObjectTable (OLE2.30) + */ +HRESULT WINAPI +GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) +{ + FIXME("(%ld,%p),stub!\n",reserved,pprot); + return E_NOTIMPL; +} diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 74f88b8aa45..552d9da109b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -47,9 +47,6 @@ #include "wownt32.h" #include "wine/unicode.h" -#include "wine/winbase16.h" -#include "wine/wingdi16.h" -#include "wine/winuser16.h" #include "compobj_private.h" #include "wine/debug.h" @@ -57,10 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(accel); -#define HICON_16(h32) (LOWORD(h32)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) - /****************************************************************************** * These are static/global variables and internal data structures that the * OLE module uses to maintain it's state. @@ -2595,15 +2588,6 @@ HRESULT WINAPI OleDoAutoConvert(LPSTORAGE pStg, LPCLSID pClsidNew) } /****************************************************************************** - * OleDoAutoConvert [OLE2.79] - */ -HRESULT WINAPI OleDoAutoConvert16(LPSTORAGE pStg, LPCLSID pClsidNew) -{ - FIXME("(%p,%p) : stub\n",pStg,pClsidNew); - return E_NOTIMPL; -} - -/****************************************************************************** * OleIsRunning [OLE32.@] */ BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject) diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c index 19e7e858ac0..12599002332 100644 --- a/dlls/ole32/ole2_16.c +++ b/dlls/ole32/ole2_16.c @@ -208,3 +208,39 @@ HRESULT WINAPI OleLoad16( FIXME("(%lx,%s,%lx,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj); return E_NOTIMPL; } + +/****************************************************************************** + * OleDoAutoConvert [OLE2.79] + */ +HRESULT WINAPI OleDoAutoConvert16(LPSTORAGE pStg, LPCLSID pClsidNew) +{ + FIXME("(%p,%p) : stub\n",pStg,pClsidNew); + return E_NOTIMPL; +} + +/*********************************************************************** + * OleSetClipboard [OLE2.49] + */ +HRESULT WINAPI OleSetClipboard16(IDataObject* pDataObj) +{ + FIXME("(%p): stub\n", pDataObj); + return S_OK; +} + +/*********************************************************************** + * OleGetClipboard [OLE2.50] + */ +HRESULT WINAPI OleGetClipboard16(IDataObject** ppDataObj) +{ + FIXME("(%p): stub\n", ppDataObj); + return E_NOTIMPL; +} + +/*********************************************************************** + * OleFlushClipboard [OLE2.76] + */ + +HRESULT WINAPI OleFlushClipboard16(void) +{ + return OleFlushClipboard(); +} diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 7e678f931d8..9eca37ab216 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -119,30 +119,3 @@ HRESULT WINAPI OleRegEnumFormatEtc ( return E_NOTIMPL; } - -/*********************************************************************** - * DllGetClassObject [OLE2.4] - */ -HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv) -{ - FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - return E_NOTIMPL; -} - -/*********************************************************************** - * OleSetClipboard [OLE2.49] - */ -HRESULT WINAPI OleSetClipboard16(IDataObject* pDataObj) -{ - FIXME("(%p): stub\n", pDataObj); - return S_OK; -} - -/*********************************************************************** - * OleGetClipboard [OLE2.50] - */ -HRESULT WINAPI OleGetClipboard16(IDataObject** ppDataObj) -{ - FIXME("(%p): stub\n", ppDataObj); - return E_NOTIMPL; -} -- 2.11.4.GIT