Win16/32 separation of olecli32.

dlls/olecli/Makefile.in

@@ -14,7 +14,9 @@ SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 C_SRCS = \
 	olecli_main.c
 
+C_SRCS16 = \
+	olecli16.c
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:
-

dlls/olecli/olecli_main.c

@@ -201,26 +201,6 @@ OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc)
 }
 
 /******************************************************************************
- *		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 @@ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
 }
 
 /******************************************************************************
- *		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 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
 }
 
 /******************************************************************************
- *		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 @@ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
 }
 
 /******************************************************************************
- *		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 @@ OLESTATUS WINAPI OleCreateLinkFromClip(
 }
 
 /******************************************************************************
- *           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 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFO
 }
 
 /******************************************************************************
- *           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 @@ BOOL WINAPI OleIsDcMeta(HDC hdc)
     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 @@ OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
 }
 
 /******************************************************************************
- *		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) {
@@ -393,19 +287,6 @@ OLESTATUS WINAPI OleQueryType(LPOLEOBJECT oleob,LONG*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;
-}
-
-/******************************************************************************
  *		OleCreateFromClip	[OLECLI32.12]
  */
 OLESTATUS WINAPI OleCreateFromClip(