diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild index 4e67dbcfe9b..f130d3c6295 100644 --- a/reactos/baseaddress.rbuild +++ b/reactos/baseaddress.rbuild @@ -184,6 +184,7 @@ + diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index fa9e7d48d15..f312f8aedee 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -325,6 +325,7 @@ dll\win32\shlwapi\shlwapi.dll 1 dll\win32\smdll\smdll.dll 1 dll\win32\snmpapi\snmpapi.dll 1 dll\win32\stdole2.tlb\stdole2.tlb 1 +dll\win32\sxs\sxs.dll 1 dll\win32\syssetup\syssetup.dll 1 dll\win32\tapi32\tapi32.dll 1 dll\win32\tapiui\tapiui.dll 1 diff --git a/reactos/dll/win32/sxs/sxs.c b/reactos/dll/win32/sxs/sxs.c new file mode 100644 index 00000000000..cd64de562f6 --- /dev/null +++ b/reactos/dll/win32/sxs/sxs.c @@ -0,0 +1,45 @@ +/* + * sxs main + * + * Copyright 2007 EA Durbin + * + * 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(sxs); + + +/*********************************************************************** + * DllMain (SXS.@) + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} diff --git a/reactos/dll/win32/sxs/sxs.rbuild b/reactos/dll/win32/sxs/sxs.rbuild new file mode 100644 index 00000000000..7559626a809 --- /dev/null +++ b/reactos/dll/win32/sxs/sxs.rbuild @@ -0,0 +1,17 @@ + + + + + + . + include/reactos/wine + + 0x600 + 0x600 + sxs.c + sxs.spec + wine + kernel32 + ntdll + + \ No newline at end of file diff --git a/reactos/dll/win32/sxs/sxs.spec b/reactos/dll/win32/sxs/sxs.spec new file mode 100644 index 00000000000..012d06b9c38 --- /dev/null +++ b/reactos/dll/win32/sxs/sxs.spec @@ -0,0 +1,2 @@ +@ stub CreateAssemblyCache +@ stub CreateAssemblyNameObject diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild index 23cf5d72992..ef58b5e7b08 100644 --- a/reactos/dll/win32/win32.rbuild +++ b/reactos/dll/win32/win32.rbuild @@ -313,6 +313,9 @@ + + + diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index d98a15e7782..97774a15fb6 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -94,6 +94,7 @@ reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync reactos/dll/win32/stdole2.tlb # Autosync +reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/urlmon # Autosync