reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 20:30:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oleaut32: Make typelib.dll into a stand-alone 16-bit module.

Browse Source
This commit is contained in:
Alexandre Julliard 2009-03-11 17:30:10 +01:00
parent 7b6dd2c9f8
commit 8a7089570d
9 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -97,7 +97,6 @@ dlls/stdole32.tlb/std_ole_v1.tlb
dlls/system.drv16 dlls/system.drv16
dlls/toolhelp.dll16 dlls/toolhelp.dll16
dlls/twain.dll16 dlls/twain.dll16
dlls/typelib.dll16
dlls/user.exe16 dlls/user.exe16
dlls/ver.dll16 dlls/ver.dll16
dlls/w32sys.dll16 dlls/w32sys.dll16

10
configure vendored
View File

@ -3921,6 +3921,7 @@ then
enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no}
enable_storage_dll16=${enable_storage_dll16:-no} enable_storage_dll16=${enable_storage_dll16:-no}
enable_stress_dll16=${enable_stress_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no}
enable_typelib_dll16=${enable_typelib_dll16:-no}
enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
enable_vmm_vxd=${enable_vmm_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no}
enable_vnbt_vxd=${enable_vnbt_vxd:-no} enable_vnbt_vxd=${enable_vnbt_vxd:-no}
@ -27225,6 +27226,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/twain_32/tests/Makefile: dlls/twain_32/tests/Makefile.in dlls/Maketest.rules" dlls/twain_32/tests/Makefile: dlls/twain_32/tests/Makefile.in dlls/Maketest.rules"
ac_config_files="$ac_config_files dlls/twain_32/tests/Makefile" ac_config_files="$ac_config_files dlls/twain_32/tests/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/typelib.dll16/Makefile"
test "x$enable_typelib_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
typelib.dll16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/typelib.dll16/Makefile: dlls/typelib.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/typelib.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/unicows/Makefile" dlls/unicows/Makefile"
test "x$enable_unicows" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ test "x$enable_unicows" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@ -29337,6 +29346,7 @@ do
"dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;;
"dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;;
"dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;; "dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;;
"dlls/typelib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/typelib.dll16/Makefile" ;;
"dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;; "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;;
"dlls/updspapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/updspapi/Makefile" ;; "dlls/updspapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/updspapi/Makefile" ;;
"dlls/url/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/url/Makefile" ;; "dlls/url/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/url/Makefile" ;;

2
configure.ac
View File

@ -158,6 +158,7 @@ then
enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_olesvr_dll16=${enable_olesvr_dll16:-no}
enable_storage_dll16=${enable_storage_dll16:-no} enable_storage_dll16=${enable_storage_dll16:-no}
enable_stress_dll16=${enable_stress_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no}
enable_typelib_dll16=${enable_typelib_dll16:-no}
enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
enable_vmm_vxd=${enable_vmm_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no}
enable_vnbt_vxd=${enable_vnbt_vxd:-no} enable_vnbt_vxd=${enable_vnbt_vxd:-no}
@ -2242,6 +2243,7 @@ WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/updspapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/updspapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

3
dlls/Makefile.in
View File

@ -36,7 +36,6 @@ WIN16_FILES = \
system.drv16 \ system.drv16 \
toolhelp.dll16 \ toolhelp.dll16 \
twain.dll16 \ twain.dll16 \
typelib.dll16 \
user.exe16 \ user.exe16 \
ver.dll16 \ ver.dll16 \
w32sys.dll16 \ w32sys.dll16 \
@ -78,7 +77,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16:
msvideo.dll16: msvideo.dll16:
echo "msvfw32.dll" >$@ echo "msvfw32.dll" >$@
ole2disp.dll16 typelib.dll16: ole2disp.dll16:
echo "oleaut32.dll" >$@ echo "oleaut32.dll" >$@
rasapi16.dll16: rasapi16.dll16:

6
dlls/oleaut32/Makefile.in
View File

@ -30,12 +30,10 @@ C_SRCS = \
vartype.c vartype.c
C_SRCS16 = \ C_SRCS16 = \
ole2disp.c \ ole2disp.c
typelib16.c
SPEC_SRCS16 = \ SPEC_SRCS16 = \
ole2disp.spec \ ole2disp.spec
typelib.spec
RC_SRCS = oleaut32.rc RC_SRCS = oleaut32.rc

1
dlls/oleaut32/hash.c
View File

@ -486,7 +486,6 @@ static const unsigned char Lookup_224[128 * 3] = {
/*********************************************************************** /***********************************************************************
* LHashValOfNameSysA (OLEAUT32.166) * LHashValOfNameSysA (OLEAUT32.166)
* LHashValOfNameSys (TYPELIB.4)
* *
* Produce a string hash value. * Produce a string hash value.
* *

15
dlls/typelib.dll16/Makefile.in Normal file
View File

@ -0,0 +1,15 @@
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = typelib.dll16
IMPORTS = oleaut32 advapi32 kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll
SPEC_SRCS = typelib.dll16.spec
C_SRCS = typelib.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend

22
dlls/oleaut32/typelib16.c → dlls/typelib.dll16/typelib.c
View File

@ -33,11 +33,11 @@
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/winbase16.h"
#include "winreg.h" #include "winreg.h"
#include "winuser.h" #include "winuser.h"
#include "objbase.h" #include "objbase.h"
#include "ole2disp.h" #include "oleauto.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
@ -75,13 +75,14 @@ QueryPathOfRegTypeLib16(
WORD wMaj, /* [in] Major version */ WORD wMaj, /* [in] Major version */
WORD wMin, /* [in] Minor version */ WORD wMin, /* [in] Minor version */
LCID lcid, /* [in] Locale Id */ LCID lcid, /* [in] Locale Id */
LPBSTR16 path) /* [out] Destination for the registry key name */ SEGPTR *path) /* [out] Destination for the registry key name */
{ {
char xguid[80]; char xguid[80];
char typelibkey[100],pathname[260]; char typelibkey[100],pathname[260];
LONG plen; LONG plen;
char *ret;
TRACE("\n"); TRACE("\n");
if (HIWORD(guid)) { if (HIWORD(guid)) {
sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16", sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16",
@ -102,7 +103,10 @@ QueryPathOfRegTypeLib16(
FIXME("key %s not found\n",typelibkey); FIXME("key %s not found\n",typelibkey);
return E_FAIL; return E_FAIL;
} }
*path = SysAllocString16(pathname); ret = HeapAlloc( GetProcessHeap(), 0, strlen(pathname) + 1 );
if (!ret) return E_FAIL;
strcpy( ret, pathname );
*path = MapLS(ret);
return S_OK; return S_OK;
} }
@ -130,6 +134,14 @@ HRESULT WINAPI LoadTypeLib16(
return E_FAIL; return E_FAIL;
} }
/***********************************************************************
* LHashValOfNameSys (TYPELIB.4)
*/
ULONG WINAPI LHashValOfNameSys16( SYSKIND skind, LCID lcid, LPCSTR lpStr)
{
return LHashValOfNameSysA( skind, lcid, lpStr );
}
/**************************************************************************** /****************************************************************************
* OaBuildVersion (TYPELIB.15) * OaBuildVersion (TYPELIB.15)
* *

2
dlls/oleaut32/typelib.spec → dlls/typelib.dll16/typelib.dll16.spec
View File

@ -1,6 +1,6 @@
2 stub CREATETYPELIB 2 stub CREATETYPELIB
3 pascal LoadTypeLib(ptr ptr) LoadTypeLib16 3 pascal LoadTypeLib(ptr ptr) LoadTypeLib16
4 pascal LHashValOfNameSys(word long str) LHashValOfNameSysA 4 pascal LHashValOfNameSys(word long str) LHashValOfNameSys16
5 stub _IID_ICREATETYPEINFO 5 stub _IID_ICREATETYPEINFO
6 stub _IID_ICREATETYPELIB 6 stub _IID_ICREATETYPELIB
7 stub _IID_ITYPECOMP 7 stub _IID_ITYPECOMP