March 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : ole32: Get rid of WINE_StringFromCLSID and A-> W conversions.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 7b6dd2c9f8339a0bc14aa7f466f5c5a0bb03da06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b6dd2c9f8339a0bc14aa7f46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 17:28:21 2009 +0100 ole32: Get rid of WINE_StringFromCLSID and A->W conversions. --- dlls/ole32/compobj.c | 69 ++++++++++-------------------------------- dlls/ole32/compobj_private.h | 3 -- 2 files changed, 16 insertions(+), 56 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0faaf7e..3eb0182 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1429,40 +1429,6 @@ HRESULT WINAPI CLSIDFromString(LPOLESTR idstr, CLSID *id ) return ret; } -/* Converts a GUID into the respective string representation. */ -HRESULT WINE_StringFromCLSID( - const CLSID *id, /* [in] GUID to be converted */ - LPSTR idstr /* [out] pointer to buffer to contain converted guid */ -) { - static const char hex[] = "0123456789ABCDEF"; - char *s; - int i; - - if (!id) - { ERR("called with id=Null\n"); - *idstr = 0x00; - return E_FAIL; - } - - sprintf(idstr, "{%08X-%04X-%04X-%02X%02X-", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1]); - s = &idstr[25]; - - /* 6 hex bytes */ - for (i = 2; i < 8; i++) { - *s++ = hex[id->Data4[i]>>4]; - *s++ = hex[id->Data4[i] & 0xf]; - } - - *s++ = '}'; - *s++ = '\0'; - - TRACE("%p->%s\n", id, idstr); - - return S_OK; -} - /****************************************************************************** * StringFromCLSID [OLE32.@] @@ -1484,20 +1450,13 @@ HRESULT WINE_StringFromCLSID( */ HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) { - char buf[80]; - HRESULT ret; - LPMALLOC mllc; - - if ((ret = CoGetMalloc(0,&mllc))) - return ret; + HRESULT ret; + LPMALLOC mllc; - ret=WINE_StringFromCLSID(id,buf); - if (ret == S_OK) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); - *idstr = IMalloc_Alloc( mllc, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, *idstr, len ); - } - return ret; + if ((ret = CoGetMalloc(0,&mllc))) return ret; + if (!(*idstr = IMalloc_Alloc( mllc, CHARS_IN_GUID * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + StringFromGUID2( id, *idstr, CHARS_IN_GUID ); + return S_OK; } /****************************************************************************** @@ -1517,11 +1476,15 @@ HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) */ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) { - char xguid[80]; - - if (WINE_StringFromCLSID(id,xguid)) - return 0; - return MultiByteToWideChar( CP_ACP, 0, xguid, -1, str, cmax ); + static const WCHAR formatW[] = { '{','%','0','8','X','-','%','0','4','X','-', + '%','0','4','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','}',0 }; + if (cmax < CHARS_IN_GUID) return 0; + sprintfW( str, formatW, id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return CHARS_IN_GUID; } /* open HKCR\\CLSID\\{string form of clsid}\\{keyname} key */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 38a6475..65d459f 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -196,9 +196,6 @@ extern void* StdGlobalInterfaceTable_Construct(void); extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv); extern void* StdGlobalInterfaceTableInstance; -/* FIXME: these shouldn't be needed, except for 16-bit functions */ -extern HRESULT WINE_StringFromCLSID(const CLSID *id,LPSTR idstr); - HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key); HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey); HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv);

1 0

Alexandre Julliard : ole32: Make compobj. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 6b40f64e180a7dc9556ed91f83e9fd2ae0da7123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b40f64e180a7dc9556ed91f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 17:12:32 2009 +0100 ole32: Make compobj.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++ configure.ac | 2 + dlls/Makefile.in | 4 - dlls/compobj.dll16/Makefile.in | 15 +++ dlls/{ole32/ole16.c => compobj.dll16/compobj.c} | 108 +++++++++++++------- .../compobj.dll16.spec} | 12 +- dlls/ole32/Makefile.in | 6 - dlls/ole32/compobj.c | 6 - 9 files changed, 104 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b40f64e180a7dc9556ed…

1 0

Alexandre Julliard : ole32: Make ole2.dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 2e1b309fba24c5648c2b65106551574eb100bd19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1b309fba24c5648c2b65106… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 17:05:20 2009 +0100 ole32: Make ole2.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 +++ configure.ac | 2 + dlls/Makefile.in | 3 +- dlls/ole2.dll16/Makefile.in | 17 +++++ dlls/{ole32 => ole2.dll16}/ifs.h | 24 ------ .../memlockbytes16.c => ole2.dll16/memlockbytes.c} | 2 +- dlls/{ole32/ole2_16.c => ole2.dll16/ole2.c} | 70 +++++++++++------- .../ole2.spec => ole2.dll16/ole2.dll16.spec} | 6 +- dlls/ole32/Makefile.in | 7 +-- dlls/ole32/ole16.c | 77 +++++++++++++++----- dlls/ole32/ole2.c | 3 - 12 files changed, 136 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e1b309fba24c5648c2b6…

1 0

Alexandre Julliard : ole32: Make storage. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: f7fe2edadd0d29f4ccd88504c3cb247544896159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fe2edadd0d29f4ccd88504c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 17:03:10 2009 +0100 ole32: Make storage.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++ configure.ac | 2 + dlls/Makefile.in | 3 +- dlls/ole32/Makefile.in | 6 +- dlls/ole32/ole2_16.c | 64 ++++++++ dlls/storage.dll16/Makefile.in | 15 ++ dlls/storage.dll16/ifs.h | 133 +++++++++++++++++ dlls/{ole32 => storage.dll16}/storage.c | 151 ++++++-------------- .../storage.dll16.spec} | 0 10 files changed, 271 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7fe2edadd0d29f4ccd88…

1 0

Alexandre Julliard : ole32: Make ole2nls. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 7511d674472890a0f3008fe7a2ccc073f560e36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7511d674472890a0f3008fe7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:53:06 2009 +0100 ole32: Make ole2nls.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/ole2nls.dll16/Makefile.in | 19 +++++++++++++++++++ dlls/{ole32 => ole2nls.dll16}/ole2nls.c | 0 .../ole2nls.dll16.spec} | 0 .../version16.rc => ole2nls.dll16/version.rc} | 0 dlls/ole32/Makefile.in | 10 ---------- 9 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index cffe7f5..b329f23 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ dlls/msvideo.dll16 dlls/msxml3/msxml3_v1.tlb dlls/ole2.dll16 dlls/ole2disp.dll16 -dlls/ole2nls.dll16 dlls/ole32/dcom.h dlls/ole32/dcom_p.c dlls/ole32/irot.h diff --git a/configure b/configure index 3db54ea..0c2dd7a 100755 --- a/configure +++ b/configure @@ -3912,6 +3912,7 @@ then enable_mouse_drv16=${enable_mouse_drv16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} @@ -26486,6 +26487,14 @@ dlls/ole2conv.dll16/Makefile: dlls/ole2conv.dll16/Makefile.in dlls/Makedll.rules ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/ole2nls.dll16/Makefile" +test "x$enable_ole2nls_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ole2nls.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ole2nls.dll16/Makefile: dlls/ole2nls.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ole2nls.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ole2prox.dll16/Makefile" test "x$enable_ole2prox_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ ole2prox.dll16" @@ -29209,6 +29218,7 @@ do "dlls/odbccp32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/Makefile" ;; "dlls/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;; "dlls/ole2conv.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2conv.dll16/Makefile" ;; + "dlls/ole2nls.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2nls.dll16/Makefile" ;; "dlls/ole2prox.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2prox.dll16/Makefile" ;; "dlls/ole2thk.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2thk.dll16/Makefile" ;; "dlls/ole32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/Makefile" ;; diff --git a/configure.ac b/configure.ac index a123504..c855f27 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,7 @@ then enable_mouse_drv16=${enable_mouse_drv16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} @@ -2146,6 +2147,7 @@ WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ole2nls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d4f465a..46a79f0 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -31,7 +31,6 @@ WIN16_FILES = \ msvideo.dll16 \ ole2.dll16 \ ole2disp.dll16 \ - ole2nls.dll16 \ rasapi16.dll16 \ setupx.dll16 \ shell.dll16 \ @@ -82,7 +81,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@ -compobj.dll16 ole2.dll16 ole2nls.dll16 storage.dll16: +compobj.dll16 ole2.dll16 storage.dll16: echo "ole32.dll" >$@ ole2disp.dll16 typelib.dll16: diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in new file mode 100644 index 0000000..54fac81 --- /dev/null +++ b/dlls/ole2nls.dll16/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole2nls.dll16 +IMPORTS = kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll +EXTRARCFLAGS = -O res16 + +SPEC_SRCS = ole2nls.dll16.spec + +C_SRCS = ole2nls.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ole32/ole2nls.c b/dlls/ole2nls.dll16/ole2nls.c similarity index 100% rename from dlls/ole32/ole2nls.c rename to dlls/ole2nls.dll16/ole2nls.c diff --git a/dlls/ole32/ole2nls.spec b/dlls/ole2nls.dll16/ole2nls.dll16.spec similarity index 100% rename from dlls/ole32/ole2nls.spec rename to dlls/ole2nls.dll16/ole2nls.dll16.spec diff --git a/dlls/ole32/version16.rc b/dlls/ole2nls.dll16/version.rc similarity index 100% rename from dlls/ole32/version16.rc rename to dlls/ole2nls.dll16/version.rc diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index d3e8198..618b197 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -50,19 +50,15 @@ C_SRCS16 = \ memlockbytes16.c \ ole16.c \ ole2_16.c \ - ole2nls.c \ storage.c SPEC_SRCS16 = \ compobj.spec \ ole2.spec \ - ole2nls.spec \ storage.spec RC_SRCS = ole32res.rc -RC_SRCS16 = version16.rc - IDL_C_SRCS = \ irot.idl @@ -76,10 +72,4 @@ EXTRA_OBJS = dlldata.o @MAKE_DLL_RULES@ -ole2nls.spec.o: ole2nls.spec version16.res - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --dll-name ole2nls --main-module $(MODULE) --res version16.res --export $(SRCDIR)/ole2nls.spec - -version16.res: version16.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc - @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : ole32: Make ole2thk. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: dc81065d44ec24a87fe590b38f1e846233f5fa9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc81065d44ec24a87fe590b38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:38:57 2009 +0100 ole32: Make ole2thk.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/ole2thk.dll16/Makefile.in | 13 +++++++++++++ .../ole2thk.dll16.spec} | 0 dlls/ole32/Makefile.in | 1 - 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3cdca21..cffe7f5 100644 --- a/.gitignore +++ b/.gitignore @@ -62,7 +62,6 @@ dlls/msxml3/msxml3_v1.tlb dlls/ole2.dll16 dlls/ole2disp.dll16 dlls/ole2nls.dll16 -dlls/ole2thk.dll16 dlls/ole32/dcom.h dlls/ole32/dcom_p.c dlls/ole32/irot.h diff --git a/configure b/configure index eb429c4..3db54ea 100755 --- a/configure +++ b/configure @@ -3913,6 +3913,7 @@ then enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} + enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -26493,6 +26494,14 @@ dlls/ole2prox.dll16/Makefile: dlls/ole2prox.dll16/Makefile.in dlls/Makedll.rules ac_config_files="$ac_config_files dlls/ole2prox.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/ole2thk.dll16/Makefile" +test "x$enable_ole2thk_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ole2thk.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ole2thk.dll16/Makefile: dlls/ole2thk.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ole2thk.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ole32/Makefile" test "x$enable_ole32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ ole32" @@ -29201,6 +29210,7 @@ do "dlls/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;; "dlls/ole2conv.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2conv.dll16/Makefile" ;; "dlls/ole2prox.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2prox.dll16/Makefile" ;; + "dlls/ole2thk.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2thk.dll16/Makefile" ;; "dlls/ole32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/Makefile" ;; "dlls/ole32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/tests/Makefile" ;; "dlls/oleacc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleacc/Makefile" ;; diff --git a/configure.ac b/configure.ac index e1167f1..a123504 100644 --- a/configure.ac +++ b/configure.ac @@ -150,6 +150,7 @@ then enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} + enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -2146,6 +2147,7 @@ WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 1b3e854..d4f465a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -32,7 +32,6 @@ WIN16_FILES = \ ole2.dll16 \ ole2disp.dll16 \ ole2nls.dll16 \ - ole2thk.dll16 \ rasapi16.dll16 \ setupx.dll16 \ shell.dll16 \ @@ -83,7 +82,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@ -compobj.dll16 ole2.dll16 ole2nls.dll16 ole2thk.dll16 storage.dll16: +compobj.dll16 ole2.dll16 ole2nls.dll16 storage.dll16: echo "ole32.dll" >$@ ole2disp.dll16 typelib.dll16: diff --git a/dlls/ole2thk.dll16/Makefile.in b/dlls/ole2thk.dll16/Makefile.in new file mode 100644 index 0000000..e558733 --- /dev/null +++ b/dlls/ole2thk.dll16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole2thk.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll + +SPEC_SRCS = ole2thk.dll16.spec + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ole32/ole2thk.spec b/dlls/ole2thk.dll16/ole2thk.dll16.spec similarity index 100% rename from dlls/ole32/ole2thk.spec rename to dlls/ole2thk.dll16/ole2thk.dll16.spec diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 2bdbad4..d3e8198 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -57,7 +57,6 @@ SPEC_SRCS16 = \ compobj.spec \ ole2.spec \ ole2nls.spec \ - ole2thk.spec \ storage.spec RC_SRCS = ole32res.rc

1 0

Alexandre Julliard : ole32: Make ole2prox. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: b4bbe0c4a0f579e08a0e47639f75177dbb1de8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bbe0c4a0f579e08a0e47639… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:36:17 2009 +0100 ole32: Make ole2prox.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/ole2prox.dll16/Makefile.in | 13 +++++++++++++ .../ole2prox.dll16.spec} | 0 dlls/ole32/Makefile.in | 1 - 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6a808da..3cdca21 100644 --- a/.gitignore +++ b/.gitignore @@ -62,7 +62,6 @@ dlls/msxml3/msxml3_v1.tlb dlls/ole2.dll16 dlls/ole2disp.dll16 dlls/ole2nls.dll16 -dlls/ole2prox.dll16 dlls/ole2thk.dll16 dlls/ole32/dcom.h dlls/ole32/dcom_p.c diff --git a/configure b/configure index e826699..eb429c4 100755 --- a/configure +++ b/configure @@ -3912,6 +3912,7 @@ then enable_mouse_drv16=${enable_mouse_drv16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -26484,6 +26485,14 @@ dlls/ole2conv.dll16/Makefile: dlls/ole2conv.dll16/Makefile.in dlls/Makedll.rules ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/ole2prox.dll16/Makefile" +test "x$enable_ole2prox_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ole2prox.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ole2prox.dll16/Makefile: dlls/ole2prox.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ole2prox.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ole32/Makefile" test "x$enable_ole32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ ole32" @@ -29191,6 +29200,7 @@ do "dlls/odbccp32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/Makefile" ;; "dlls/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;; "dlls/ole2conv.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2conv.dll16/Makefile" ;; + "dlls/ole2prox.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2prox.dll16/Makefile" ;; "dlls/ole32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/Makefile" ;; "dlls/ole32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/tests/Makefile" ;; "dlls/oleacc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleacc/Makefile" ;; diff --git a/configure.ac b/configure.ac index 584f43c..e1167f1 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,7 @@ then enable_mouse_drv16=${enable_mouse_drv16:-no} enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -2144,6 +2145,7 @@ WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d3dcf3f..1b3e854 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -32,7 +32,6 @@ WIN16_FILES = \ ole2.dll16 \ ole2disp.dll16 \ ole2nls.dll16 \ - ole2prox.dll16 \ ole2thk.dll16 \ rasapi16.dll16 \ setupx.dll16 \ @@ -84,7 +83,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@ -compobj.dll16 ole2.dll16 ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 storage.dll16: +compobj.dll16 ole2.dll16 ole2nls.dll16 ole2thk.dll16 storage.dll16: echo "ole32.dll" >$@ ole2disp.dll16 typelib.dll16: diff --git a/dlls/ole2prox.dll16/Makefile.in b/dlls/ole2prox.dll16/Makefile.in new file mode 100644 index 0000000..b0f2a2d --- /dev/null +++ b/dlls/ole2prox.dll16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole2prox.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll + +SPEC_SRCS = ole2prox.dll16.spec + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ole32/ole2prox.spec b/dlls/ole2prox.dll16/ole2prox.dll16.spec similarity index 100% rename from dlls/ole32/ole2prox.spec rename to dlls/ole2prox.dll16/ole2prox.dll16.spec diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index ccdd8c3..2bdbad4 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -57,7 +57,6 @@ SPEC_SRCS16 = \ compobj.spec \ ole2.spec \ ole2nls.spec \ - ole2prox.spec \ ole2thk.spec \ storage.spec

1 0

Alexandre Julliard : ole32: Make ole2conv. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: ea6382623e47e030ced2a029ff4ca3d96a1fe67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6382623e47e030ced2a029f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:32:36 2009 +0100 ole32: Make ole2conv.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/ole2conv.dll16/Makefile.in | 13 +++++++++++++ .../ole2conv.dll16.spec} | 0 dlls/ole32/Makefile.in | 1 - 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cc679a7..6a808da 100644 --- a/.gitignore +++ b/.gitignore @@ -60,7 +60,6 @@ dlls/mstask/mstask_local_i.c dlls/msvideo.dll16 dlls/msxml3/msxml3_v1.tlb dlls/ole2.dll16 -dlls/ole2conv.dll16 dlls/ole2disp.dll16 dlls/ole2nls.dll16 dlls/ole2prox.dll16 diff --git a/configure b/configure index 0a7eb83..e826699 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_ole2conv_dll16=${enable_ole2conv_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -26475,6 +26476,14 @@ dlls/odbccp32/tests/Makefile: dlls/odbccp32/tests/Makefile.in dlls/Maketest.rule ac_config_files="$ac_config_files dlls/odbccp32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/ole2conv.dll16/Makefile" +test "x$enable_ole2conv_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ole2conv.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ole2conv.dll16/Makefile: dlls/ole2conv.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ole32/Makefile" test "x$enable_ole32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ ole32" @@ -29181,6 +29190,7 @@ do "dlls/odbc32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbc32/Makefile" ;; "dlls/odbccp32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/Makefile" ;; "dlls/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;; + "dlls/ole2conv.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2conv.dll16/Makefile" ;; "dlls/ole32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/Makefile" ;; "dlls/ole32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole32/tests/Makefile" ;; "dlls/oleacc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleacc/Makefile" ;; diff --git a/configure.ac b/configure.ac index e4e28f6..584f43c 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_ole2conv_dll16=${enable_ole2conv_dll16:-no} enable_olecli_dll16=${enable_olecli_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -2142,6 +2143,7 @@ WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f3b80e6..d3dcf3f 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -30,7 +30,6 @@ WIN16_FILES = \ mmsystem.dll16 \ msvideo.dll16 \ ole2.dll16 \ - ole2conv.dll16 \ ole2disp.dll16 \ ole2nls.dll16 \ ole2prox.dll16 \ @@ -85,7 +84,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@ -compobj.dll16 ole2.dll16 ole2conv.dll16 ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 storage.dll16: +compobj.dll16 ole2.dll16 ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 storage.dll16: echo "ole32.dll" >$@ ole2disp.dll16 typelib.dll16: diff --git a/dlls/ole2conv.dll16/Makefile.in b/dlls/ole2conv.dll16/Makefile.in new file mode 100644 index 0000000..8e132fb --- /dev/null +++ b/dlls/ole2conv.dll16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole2conv.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll + +SPEC_SRCS = ole2conv.dll16.spec + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ole32/ole2conv.spec b/dlls/ole2conv.dll16/ole2conv.dll16.spec similarity index 100% rename from dlls/ole32/ole2conv.spec rename to dlls/ole2conv.dll16/ole2conv.dll16.spec diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index f8d7481..ccdd8c3 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -56,7 +56,6 @@ C_SRCS16 = \ SPEC_SRCS16 = \ compobj.spec \ ole2.spec \ - ole2conv.spec \ ole2nls.spec \ ole2prox.spec \ ole2thk.spec \

1 0

Alexandre Julliard : olesvr32: Make olesvr. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: b12965ceaa218acf5e4f619f97aac1f364fe010f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12965ceaa218acf5e4f619f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 16:27:35 2009 +0100 olesvr32: Make olesvr.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 + configure.ac | 2 + dlls/Makefile.in | 4 - dlls/olesvr.dll16/Makefile.in | 15 ++ dlls/olesvr.dll16/olesvr.c | 226 ++++++++++++++++++++ .../olesvr.spec => olesvr.dll16/olesvr.dll16.spec} | 0 dlls/olesvr32/Makefile.in | 2 - dlls/olesvr32/olesvr_main.c | 94 -------- 9 files changed, 253 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b12965ceaa218acf5e4f6…

1 0

Alexandre Julliard : olecli32: Make olecli. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 7c288601701963d2efed393faf53e069a5a1df9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c288601701963d2efed393fa… Author: Alexandre Julliard <julliard(a)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 + +(a)MAKE_DLL_RULES@ + +(a)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

1 0