PATCH - Olecli32 Win16/32 Cleanup

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Map[SL,LS] and UnMap[SL,LS] are Win9xisms that are only documented in a KB artical and not in the API so we should use them as little as possible. Compile out with --disable-win16

Changelog: Win16/32 separation of olecli32
Index: olecli_main.c
===================================================================
RCS file: /home/wine/wine/dlls/olecli/olecli_main.c,v
retrieving revision 1.14
diff -u -r1.14 olecli_main.c
--- olecli_main.c	23 Dec 2002 01:46:34 -0000	1.14
+++ olecli_main.c	20 May 2003 12:40:26 -0000
@@ -201,26 +201,6 @@
 }
 
 /******************************************************************************
- *		OleSavedClientDoc	[OLECLI.45]
- */
-OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc)
-{
-    FIXME("(%ld: stub\n", hDoc);
-    return OLE_OK;
-}
-
-/******************************************************************************
- *		OleRegisterClientDoc	[OLECLI.41]
- */
-OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
-                                        LONG reserved, LHCLIENTDOC *hRet )
-{
-    FIXME("(%s,%s,...): stub\n",classname,docname);
-    *hRet=++OLE_current_handle;
-    return OLE_OK;
-}
-
-/******************************************************************************
  *		OleRegisterClientDoc	[OLECLI32.41]
  */
 OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
@@ -232,15 +212,6 @@
 }
 
 /******************************************************************************
- *		OleRenameClientDoc	[OLECLI.43]
- */
-OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
-{
-    FIXME("(%ld,%s,...): stub\n",hDoc, newName);
-    return OLE_OK;
-}
-
-/******************************************************************************
  *		OleRenameClientDoc	[OLECLI32.43]
  */
 OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
@@ -250,15 +221,6 @@
 }
 
 /******************************************************************************
- *		OleRevokeClientDoc	[OLECLI.42]
- */
-OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
-{
-    FIXME("(%ld): stub\n",hServerDoc);
-    return OLE_OK;
-}
-
-/******************************************************************************
  *		OleRevokeClientDoc	[OLECLI32.42]
  */
 OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
@@ -268,38 +230,6 @@
 }
 
 /******************************************************************************
- *		OleRevertClientDoc	[OLECLI.44]
- */
-OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
-{
-    FIXME("(%ld): stub\n", hServerDoc);
-    return OLE_OK;
-}
-
-/******************************************************************************
- *		OleEnumObjects	[OLECLI.47]
- */
-OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data)
-{
-    FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
-	LOWORD(data));
-    return OLE_OK;
-}
-
-/******************************************************************************
- *	     OleCreateLinkFromClip	[OLECLI.11]
- */
-OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc,
-                                          LPCSTR xname, SEGPTR lpoleob, UINT16 render,
-                                          UINT16 clipformat )
-{
-	FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
-              name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob),
-              LOWORD(lpoleob), render, clipformat);
-	return OLE_OK;
-}
-
-/******************************************************************************
  *           OleCreateLinkFromClip	[OLECLI32.11]
  */
 OLESTATUS WINAPI OleCreateLinkFromClip(
@@ -312,15 +242,6 @@
 }
 
 /******************************************************************************
- *           OleQueryLinkFromClip	[OLECLI.9]
- */
-OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat)
-{
-	FIXME("(%s, %d, %d): stub!\n", name, render, clipformat);
-	return OLE_OK;
-}
-
-/******************************************************************************
  *           OleQueryLinkFromClip	[OLECLI32.9]
  */
 OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
@@ -329,15 +250,6 @@
 }
 
 /******************************************************************************
- *           OleQueryCreateFromClip	[OLECLI.10]
- */
-OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat)
-{
-	FIXME("(%s, %d, %d): stub!\n", name, render, clipformat);
-	return OLE_OK;
-}
-
-/******************************************************************************
  *           OleQueryCreateFromClip	[OLECLI32.10]
  */
 OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
@@ -354,16 +266,6 @@
     return GetObjectType( hdc ) == OBJ_METADC;
 }
 
-
-/******************************************************************************
- *		OleIsDcMeta	[OLECLI.60]
- */
-BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
-{
-    return OleIsDcMeta( HDC_32(hdc) );
-}
-
-
 /******************************************************************************
  *		OleSetHostNames	[OLECLI32.15]
  */
@@ -373,14 +275,6 @@
 }
 
 /******************************************************************************
- *		OleQueryType	[OLECLI.14]
- */
-OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob,  SEGPTR xlong) {
-	FIXME("(%p, %p): stub!\n", oleob, MapSL(xlong));
-	return OLE_OK;
-}
-
-/******************************************************************************
  *		OleQueryType	[OLECLI32.14]
  */
 OLESTATUS WINAPI OleQueryType(LPOLEOBJECT oleob,LONG*xlong) {
@@ -390,19 +284,6 @@
 	TRACE("Calling OLEOBJECT.QueryType (%p) (%p,%p)\n",
 	      oleob->lpvtbl->QueryType,oleob,xlong);
 	return oleob->lpvtbl->QueryType(oleob,xlong);
-}
-
-/******************************************************************************
- *		OleCreateFromClip	[OLECLI.12]
- */
-OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc,
-                                      LPCSTR xname, SEGPTR lpoleob,
-                                      UINT16 render, UINT16 clipformat )
-{
-	FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
-              name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob),
-              LOWORD(lpoleob), render, clipformat);
-	return OLE_OK;
 }
 
 /******************************************************************************

Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/olecli/Makefile.in,v
retrieving revision 1.14
diff -u -r1.14 Makefile.in
--- Makefile.in	23 Mar 2003 20:00:03 -0000	1.14
+++ Makefile.in	20 May 2003 12:40:43 -0000
@@ -14,6 +14,9 @@
 C_SRCS = \
 	olecli_main.c
 
+C_SRCS16 = \
+	olecli16.c
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:



--- /dev/null	Tue May 20 08:41:04 2003
+++ olecli16.c	Sun May 18 14:01:10 2003
@@ -0,0 +1,309 @@
+/*
+ *	OLECLI library
+ *
+ *	Copyright 1995	Martin von Loewis
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*	At the moment, these are only empty stubs.
+ */
+
+#include "config.h"
+
+#include "windef.h"
+#include "wine/windef16.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "wownt32.h"
+#include "objbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+typedef enum
+{
+    OLE_OK,
+    OLE_WAIT_FOR_RELEASE,
+    OLE_BUSY,
+    OLE_ERROR_PROTECT_ONLY,
+    OLE_ERROR_MEMORY,
+    OLE_ERROR_STREAM,
+    OLE_ERROR_STATIC,
+    OLE_ERROR_BLANK,
+    OLE_ERROR_DRAW,
+    OLE_ERROR_METAFILE,
+    OLE_ERROR_ABORT,
+    OLE_ERROR_CLIPBOARD,
+    OLE_ERROR_FORMAT,
+    OLE_ERROR_OBJECT,
+    OLE_ERROR_OPTION,
+    OLE_ERROR_PROTOCOL,
+    OLE_ERROR_ADDRESS,
+    OLE_ERROR_NOT_EQUAL,
+    OLE_ERROR_HANDLE,
+    OLE_ERROR_GENERIC,
+    OLE_ERROR_CLASS,
+    OLE_ERROR_SYNTAX,
+    OLE_ERROR_DATATYPE,
+    OLE_ERROR_PALETTE,
+    OLE_ERROR_NOT_LINK,
+    OLE_ERROR_NOT_EMPTY,
+    OLE_ERROR_SIZE,
+    OLE_ERROR_DRIVE,
+    OLE_ERROR_NETWORK,
+    OLE_ERROR_NAME,
+    OLE_ERROR_TEMPLATE,
+    OLE_ERROR_NEW,
+    OLE_ERROR_EDIT,
+    OLE_ERROR_OPEN,
+    OLE_ERROR_NOT_OPEN,
+    OLE_ERROR_LAUNCH,
+    OLE_ERROR_COMM,
+    OLE_ERROR_TERMINATE,
+    OLE_ERROR_COMMAND,
+    OLE_ERROR_SHOW,
+    OLE_ERROR_DOVERB,
+    OLE_ERROR_ADVISE_NATIVE,
+    OLE_ERROR_ADVISE_PICT,
+    OLE_ERROR_ADVISE_RENAME,
+    OLE_ERROR_POKE_NATIVE,
+    OLE_ERROR_REQUEST_NATIVE,
+    OLE_ERROR_REQUEST_PICT,
+    OLE_ERROR_SERVER_BLOCKED,
+    OLE_ERROR_REGISTRATION,
+    OLE_ERROR_ALREADY_REGISTERED,
+    OLE_ERROR_TASK,
+    OLE_ERROR_OUTOFDATE,
+    OLE_ERROR_CANT_UPDATE_CLIENT,
+    OLE_ERROR_UPDATE,
+    OLE_ERROR_SETDATA_FORMAT,
+    OLE_ERROR_STATIC_FROM_OTHER_OS,
+    OLE_WARN_DELETE_DATA = 1000
+} OLESTATUS;
+
+typedef enum
+{
+    olerender_none,
+    olerender_draw,
+    olerender_format
+} OLEOPT_RENDER;
+
+typedef enum
+{
+    oleupdate_always,
+    oleupdate_onsave,
+    oleupdate_oncall,
+    oleupdate_onclose
+} OLEOPT_UPDATE;
+
+typedef enum {
+    OLE_NONE,     /* none */
+    OLE_DELETE,   /* delete object */
+    OLE_LNKPASTE, /* link paste */
+    OLE_EMBPASTE, /* paste(and update) */
+    OLE_SHOW,
+    OLE_RUN,
+    OLE_ACTIVATE,
+    OLE_UPDATE,
+    OLE_CLOSE,
+    OLE_RECONNECT,
+    OLE_SETUPDATEOPTIONS,
+    OLE_SERVERRUNLAUNCH, /* unlaunch (terminate?) server */
+    OLE_LOADFROMSTREAM,  /* (auto reconnect) */
+    OLE_SETDATA,         /* OleSetData */
+    OLE_REQUESTDATA,     /* OleRequestData */
+    OLE_OTHER,
+    OLE_CREATE,
+    OLE_CREATEFROMTEMPLATE,
+    OLE_CREATELINKFROMFILE,
+    OLE_COPYFROMLNK,
+    OLE_CREATREFROMFILE,
+    OLE_CREATEINVISIBLE
+} OLE_RELEASE_METHOD;
+
+typedef LONG LHCLIENTDOC;
+typedef struct _OLEOBJECT *LPOLEOBJECT;
+typedef struct _OLECLIENT *LPOLECLIENT;
+typedef LONG OLECLIPFORMAT;/* dunno about this type, please change/add */
+typedef OLEOPT_UPDATE *LPOLEOPT_UPDATE;
+
+struct _OLESTREAM;
+
+typedef struct _OLEOBJECTVTBL {
+    void CALLBACK *(*QueryProtocol)(LPOLEOBJECT,LPCOLESTR16);
+    OLESTATUS      (CALLBACK *Release)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *Show)(LPOLEOBJECT,BOOL16);
+    OLESTATUS      (CALLBACK *DoVerb)(LPOLEOBJECT,UINT16,BOOL16,BOOL16);
+    OLESTATUS      (CALLBACK *GetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE16 *);
+    OLESTATUS      (CALLBACK *SetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE16);
+    OLESTATUS      (CALLBACK *SetTargetDevice)(LPOLEOBJECT,HGLOBAL16);
+    OLESTATUS      (CALLBACK *SetBounds)(LPOLEOBJECT,LPRECT16);
+    OLESTATUS      (CALLBACK *EnumFormats)(LPOLEOBJECT,OLECLIPFORMAT);
+    OLESTATUS      (CALLBACK *SetColorScheme)(LPOLEOBJECT,struct tagLOGPALETTE*);
+    OLESTATUS      (CALLBACK *Delete)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *SetHostNames)(LPOLEOBJECT,LPCOLESTR16,LPCOLESTR16);
+    OLESTATUS      (CALLBACK *SaveToStream)(LPOLEOBJECT,struct _OLESTREAM*);
+    OLESTATUS      (CALLBACK *Clone)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT *);
+    OLESTATUS      (CALLBACK *CopyFromLink)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT *);
+    OLESTATUS      (CALLBACK *Equal)(LPOLEOBJECT,LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *CopyToClipBoard)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *Draw)(LPOLEOBJECT,HDC16,LPRECT16,LPRECT16,HDC16);
+    OLESTATUS      (CALLBACK *Activate)(LPOLEOBJECT,UINT16,BOOL16,BOOL16,HWND16,LPRECT16);
+    OLESTATUS      (CALLBACK *Execute)(LPOLEOBJECT,HGLOBAL16,UINT16);
+    OLESTATUS      (CALLBACK *Close)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *Update)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *Reconnect)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *ObjectConvert)(LPOLEOBJECT,LPCOLESTR16,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT*);
+    OLESTATUS      (CALLBACK *GetLinkUpdateOptions)(LPOLEOBJECT,LPOLEOPT_UPDATE);
+    OLESTATUS      (CALLBACK *SetLinkUpdateOptions)(LPOLEOBJECT,OLEOPT_UPDATE);
+    OLESTATUS      (CALLBACK *Rename)(LPOLEOBJECT,LPCOLESTR16);
+    OLESTATUS      (CALLBACK *QueryName)(LPOLEOBJECT,LPSTR,LPUINT16);
+    OLESTATUS      (CALLBACK *QueryType)(LPOLEOBJECT,LPLONG);
+    OLESTATUS      (CALLBACK *QueryBounds)(LPOLEOBJECT,LPRECT16);
+    OLESTATUS      (CALLBACK *QuerySize)(LPOLEOBJECT,LPDWORD);
+    OLESTATUS      (CALLBACK *QueryOpen)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *QueryOutOfDate)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *QueryReleaseStatus)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *QueryReleaseError)(LPOLEOBJECT);
+    OLE_RELEASE_METHOD (CALLBACK *QueryReleaseMethod)(LPOLEOBJECT);
+    OLESTATUS      (CALLBACK *RequestData)(LPOLEOBJECT,OLECLIPFORMAT);
+    OLESTATUS      (CALLBACK *ObjectLong)(LPOLEOBJECT,UINT16,LPLONG);
+} OLEOBJECTVTBL;
+typedef OLEOBJECTVTBL *LPOLEOBJECTVTBL;
+
+typedef struct _OLEOBJECT
+{
+    LPOLEOBJECTVTBL lpvtbl;
+} OLEOBJECT;
+
+static LONG OLE_current_handle;
+
+/******************************************************************************
+ *		OleSavedClientDoc	[OLECLI.45]
+ */
+OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc)
+{
+    FIXME("(%ld: stub\n", hDoc);
+    return OLE_OK;
+}
+
+/******************************************************************************
+ *		OleRegisterClientDoc	[OLECLI.41]
+ */
+OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
+                                        LONG reserved, LHCLIENTDOC *hRet )
+{
+    FIXME("(%s,%s,...): stub\n",classname,docname);
+    *hRet=++OLE_current_handle;
+    return OLE_OK;
+}
+
+/******************************************************************************
+ *		OleRenameClientDoc	[OLECLI.43]
+ */
+OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
+{
+    FIXME("(%ld,%s,...): stub\n",hDoc, newName);
+    return OLE_OK;
+}
+
+/******************************************************************************
+ *		OleRevokeClientDoc	[OLECLI.42]
+ */
+OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
+{
+    FIXME("(%ld): stub\n",hServerDoc);
+    return OLE_OK;
+}
+
+/******************************************************************************
+ *		OleRevertClientDoc	[OLECLI.44]
+ */
+OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
+{
+    FIXME("(%ld): stub\n", hServerDoc);
+    return OLE_OK;
+}
+
+/******************************************************************************
+ *		OleEnumObjects	[OLECLI.47]
+ */
+OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data)
+{
+    FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
+	LOWORD(data));
+    return OLE_OK;
+}
+
+/******************************************************************************
+ *	     OleCreateLinkFromClip	[OLECLI.11]
+ */
+OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc,
+                                          LPCSTR xname, SEGPTR lpoleob, UINT16 render,
+                                          UINT16 clipformat )
+{
+	FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
+              name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob),
+              LOWORD(lpoleob), render, clipformat);
+	return OLE_OK;
+}
+
+/******************************************************************************
+ *           OleQueryLinkFromClip	[OLECLI.9]
+ */
+OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat)
+{
+	FIXME("(%s, %d, %d): stub!\n", name, render, clipformat);
+	return OLE_OK;
+}
+
+/******************************************************************************
+ *           OleQueryCreateFromClip	[OLECLI.10]
+ */
+OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat)
+{
+	FIXME("(%s, %d, %d): stub!\n", name, render, clipformat);
+	return OLE_OK;
+}
+
+/******************************************************************************
+ *		OleIsDcMeta	[OLECLI.60]
+ */
+BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
+{
+    return OleIsDcMeta( HDC_32(hdc) );
+}
+
+/******************************************************************************
+ *		OleQueryType	[OLECLI.14]
+ */
+OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob,  SEGPTR xlong) {
+	FIXME("(%p, %p): stub!\n", oleob, MapSL(xlong));
+	return OLE_OK;
+}
+
+/******************************************************************************
+ *		OleCreateFromClip	[OLECLI.12]
+ */
+OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc,
+                                      LPCSTR xname, SEGPTR lpoleob,
+                                      UINT16 render, UINT16 clipformat )
+{
+	FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
+              name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob),
+              LOWORD(lpoleob), render, clipformat);
+	return OLE_OK;
+}

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux