diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild index 5745f058cb4..b2256f8a333 100644 --- a/reactos/baseaddress.rbuild +++ b/reactos/baseaddress.rbuild @@ -104,6 +104,7 @@ + diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index 1bd234538f7..b38523d4d1f 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -331,6 +331,7 @@ dll\win32\olecli32\olecli32.dll 1 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 diff --git a/reactos/dll/win32/olethk32/main.c b/reactos/dll/win32/olethk32/main.c new file mode 100644 index 00000000000..13de72eb197 --- /dev/null +++ b/reactos/dll/win32/olethk32/main.c @@ -0,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 +#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; +} diff --git a/reactos/dll/win32/olethk32/olethk32.rbuild b/reactos/dll/win32/olethk32/olethk32.rbuild new file mode 100644 index 00000000000..82d289266b0 --- /dev/null +++ b/reactos/dll/win32/olethk32/olethk32.rbuild @@ -0,0 +1,11 @@ + + + . + include/reactos/wine + + main.c + version.rc + wine + kernel32 + ntdll + diff --git a/reactos/dll/win32/olethk32/olethk32.spec b/reactos/dll/win32/olethk32/olethk32.spec new file mode 100644 index 00000000000..337d25e2192 --- /dev/null +++ b/reactos/dll/win32/olethk32/olethk32.spec @@ -0,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 diff --git a/reactos/dll/win32/olethk32/version.rc b/reactos/dll/win32/olethk32/version.rc new file mode 100644 index 00000000000..900f55204ed --- /dev/null +++ b/reactos/dll/win32/olethk32/version.rc @@ -0,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" diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild index ed7b51e25bb..18b59e1faba 100644 --- a/reactos/dll/win32/win32.rbuild +++ b/reactos/dll/win32/win32.rbuild @@ -292,6 +292,9 @@ + + + diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 1dab9338171..11118a771b6 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -88,6 +88,7 @@ reactos/dll/win32/olecli32 # Autosync 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