Alexandre Julliard : olecli32: Make olecli. dll into a stand-alone 16-bit module.
Alexandre Julliard
julliard at winehq.org
Thu Mar 12 09:54:13 CDT 2009
Module: wine
Branch: master
Commit: 7c288601701963d2efed393faf53e069a5a1df9c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c288601701963d2efed393faf53e069a5a1df9c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Mar 11 16:26:37 2009 +0100
olecli32: Make olecli.dll into a stand-alone 16-bit module.
---
.gitignore | 1 -
configure | 10 ++
configure.ac | 2 +
dlls/Makefile.in | 4 -
dlls/olecli.dll16/Makefile.in | 15 +++
.../{olecli32/olecli16.c => olecli.dll16/olecli.c} | 0
.../olecli.spec => olecli.dll16/olecli.dll16.spec} | 0
dlls/olecli.dll16/olecli.h | 122 ++++++++++++++++++++
dlls/olecli32/Makefile.in | 5 -
9 files changed, 149 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6ae5342..acf6937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,7 +83,6 @@ dlls/oleaut32/tests/test_tlb.tlb
dlls/oleaut32/tests/tmarshal.h
dlls/oleaut32/tests/tmarshal.tlb
dlls/oleaut32/tests/tmarshal_i.c
-dlls/olecli.dll16
dlls/olesvr.dll16
dlls/qmgr/qmgr_local.h
dlls/qmgr/qmgr_local_i.c
diff --git a/configure b/configure
index 09152d8..28b514c 100755
--- a/configure
+++ b/configure
@@ -3911,6 +3911,7 @@ then
enable_monodebg_vxd=${enable_monodebg_vxd:-no}
enable_mouse_drv16=${enable_mouse_drv16:-no}
enable_msacm_dll16=${enable_msacm_dll16:-no}
+ enable_olecli_dll16=${enable_olecli_dll16:-no}
enable_stress_dll16=${enable_stress_dll16:-no}
enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
enable_vmm_vxd=${enable_vmm_vxd:-no}
@@ -26521,6 +26522,14 @@ dlls/oleaut32/tests/Makefile: dlls/oleaut32/tests/Makefile.in dlls/Maketest.rule
ac_config_files="$ac_config_files dlls/oleaut32/tests/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
+ dlls/olecli.dll16/Makefile"
+test "x$enable_olecli_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ olecli.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/olecli.dll16/Makefile: dlls/olecli.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/olecli.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/olecli32/Makefile"
test "x$enable_olecli32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
olecli32"
@@ -29169,6 +29178,7 @@ do
"dlls/oleacc/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleacc/tests/Makefile" ;;
"dlls/oleaut32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleaut32/Makefile" ;;
"dlls/oleaut32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleaut32/tests/Makefile" ;;
+ "dlls/olecli.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olecli.dll16/Makefile" ;;
"dlls/olecli32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olecli32/Makefile" ;;
"dlls/oledlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledlg/Makefile" ;;
"dlls/olepro32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olepro32/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index a664ef9..db9b011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,7 @@ then
enable_monodebg_vxd=${enable_monodebg_vxd:-no}
enable_mouse_drv16=${enable_mouse_drv16:-no}
enable_msacm_dll16=${enable_msacm_dll16:-no}
+ enable_olecli_dll16=${enable_olecli_dll16:-no}
enable_stress_dll16=${enable_stress_dll16:-no}
enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
enable_vmm_vxd=${enable_vmm_vxd:-no}
@@ -2146,6 +2147,7 @@ WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
WINE_CONFIG_MAKEFILE([dlls/oleacc/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
+WINE_CONFIG_MAKEFILE([dlls/olecli.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 1abd27d..d2cb289 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -35,7 +35,6 @@ WIN16_FILES = \
ole2nls.dll16 \
ole2prox.dll16 \
ole2thk.dll16 \
- olecli.dll16 \
olesvr.dll16 \
rasapi16.dll16 \
setupx.dll16 \
@@ -93,9 +92,6 @@ compobj.dll16 ole2.dll16 ole2conv.dll16 ole2nls.dll16 ole2prox.dll16 ole2thk.dll
ole2disp.dll16 typelib.dll16:
echo "oleaut32.dll" >$@
-olecli.dll16:
- echo "olecli32.dll" >$@
-
olesvr.dll16:
echo "olesvr32.dll" >$@
diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in
new file mode 100644
index 0000000..20d7594
--- /dev/null
+++ b/dlls/olecli.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = olecli.dll16
+IMPORTS = gdi32 kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,olecli32.dll
+
+SPEC_SRCS = olecli.dll16.spec
+
+C_SRCS = olecli.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/olecli32/olecli16.c b/dlls/olecli.dll16/olecli.c
similarity index 100%
rename from dlls/olecli32/olecli16.c
rename to dlls/olecli.dll16/olecli.c
diff --git a/dlls/olecli32/olecli.spec b/dlls/olecli.dll16/olecli.dll16.spec
similarity index 100%
rename from dlls/olecli32/olecli.spec
rename to dlls/olecli.dll16/olecli.dll16.spec
diff --git a/dlls/olecli.dll16/olecli.h b/dlls/olecli.dll16/olecli.h
new file mode 100644
index 0000000..b98e025
--- /dev/null
+++ b/dlls/olecli.dll16/olecli.h
@@ -0,0 +1,122 @@
+/*
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+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
+{
+ 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;
+typedef LPCSTR LPCOLESTR16;
+
+struct _OLESTREAM;
diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in
index ec511ab..794e4da 100644
--- a/dlls/olecli32/Makefile.in
+++ b/dlls/olecli32/Makefile.in
@@ -9,11 +9,6 @@ IMPORTS = ole32 gdi32 kernel32
C_SRCS = \
olecli_main.c
-C_SRCS16 = \
- olecli16.c
-
-SPEC_SRCS16 = olecli.spec
-
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
More information about the wine-cvs
mailing list