Author: dchapyshev Date: Thu Feb 12 04:56:57 2009 New Revision: 39560
URL: http://svn.reactos.org/svn/reactos?rev=39560&view=rev Log: - Add olethk32 from Wine
Added: trunk/reactos/dll/win32/olethk32/ (with props) trunk/reactos/dll/win32/olethk32/main.c (with props) trunk/reactos/dll/win32/olethk32/olethk32.rbuild (with props) trunk/reactos/dll/win32/olethk32/olethk32.spec (with props) trunk/reactos/dll/win32/olethk32/version.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=3956... ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -104,6 +104,7 @@ <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> <property name="BASEADDRESS_OLESVR32" value="0x71dd0000" /> <property name="BASEADDRESS_OLECLI32" value="0x71df0000" /> + <property name="BASEADDRESS_OLETHK32" value="0x71e10000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> <property name="BASEADDRESS_CRYPTUI" value="0x720D0000" />
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reac... ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -331,6 +331,7 @@ dll\win32\oledlg\oledlg.dll 1 dll\win32\olepro32\olepro32.dll 1 dll\win32\olesvr32\olesvr32.dll 1 +dll\win32\olethk32\olethk32.dll 1 dll\win32\opengl32\opengl32.dll 1 dll\win32\pdh\pdh.dll 1 dll\win32\powrprof\powrprof.dll 1
Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 12 04:56:57 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+)
Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10
Added: trunk/reactos/dll/win32/olethk32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/main.c?r... ============================================================================== --- trunk/reactos/dll/win32/olethk32/main.c (added) +++ trunk/reactos/dll/win32/olethk32/main.c [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,37 @@ +/* + * Copyright 2007 Stefan Leichter + * + * 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(olethk32); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(hinstDLL); + + return TRUE; +}
Propchange: trunk/reactos/dll/win32/olethk32/main.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/dll/win32/olethk32/olethk32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/olethk32... ============================================================================== --- trunk/reactos/dll/win32/olethk32/olethk32.rbuild (added) +++ trunk/reactos/dll/win32/olethk32/olethk32.rbuild [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,11 @@ +<module name="olethk32" type="win32dll" baseaddress="${BASEADDRESS_OLETHK32}" installbase="system32" installname="olethk32.dll" allowwarnings="true"> + <importlibrary definition="olethk32.spec" /> + <include base="olethk32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>main.c</file> + <file>version.rc</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module>
Propchange: trunk/reactos/dll/win32/olethk32/olethk32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/dll/win32/olethk32/olethk32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/olethk32... ============================================================================== --- trunk/reactos/dll/win32/olethk32/olethk32.spec (added) +++ trunk/reactos/dll/win32/olethk32/olethk32.spec [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,14 @@ + 3 stub InvokeOn32 + 4 stub IntOpInitialize + 5 stub CallbackProcessing_3216 + 6 stub IUnknownObj32 + 8 stub CSm16ReleaseHandler_Release32 + 9 stub ThkMgrInitialize +10 stub ThkMgrUninitialize +11 stub TransformHRESULT_1632 +12 stub TransformHRESULT_3216 +13 stub ConvertObjDescriptor +14 stub ConvertHr1632Thunk +15 stub ConvertHr3216Thunk +16 stub IntOpUninitialize +18 stub ThkAddAppCompatFlag
Propchange: trunk/reactos/dll/win32/olethk32/olethk32.spec ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/dll/win32/olethk32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/version.... ============================================================================== --- trunk/reactos/dll/win32/olethk32/version.rc (added) +++ trunk/reactos/dll/win32/olethk32/version.rc [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2007 Stefan Leichter + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine olethk32 dll" +#define WINE_FILENAME_STR "olethk32.dll" +#define WINE_FILEVERSION 5,1,2600,0 +#define WINE_FILEVERSION_STR "5.1.2600.0" +#define WINE_PRODUCTVERSION 5,1,2600,0 +#define WINE_PRODUCTVERSION_STR "5.1.2600.0" + +#include "wine/wine_common_ver.rc"
Propchange: trunk/reactos/dll/win32/olethk32/version.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev=... ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -292,6 +292,9 @@ <directory name="olesvr32"> <xi:include href="olesvr32/olesvr32.rbuild" /> </directory> +<directory name="olethk32"> + <xi:include href="olethk32/olethk32.rbuild" /> +</directory> <directory name="opengl32"> <xi:include href="opengl32/opengl32.rbuild" /> </directory>
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=3... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -88,6 +88,7 @@ reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync reactos/dll/win32/olesvr32 # Autosync +reactos/dll/win32/olethk32 # Autosync reactos/dll/win32/pdh # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Autosync
-
dchapyshev＠svn.reactos.org