[dchapyshev] 35183: - Add sxs.dll from Wine

Author: dchapyshev
Date: Fri Aug  8 09:32:35 2008
New Revision: 35183

URL: http://svn.reactos.org/svn/reactos?rev=35183&view=rev
Log:
- Add sxs.dll from Wine

Added:
    trunk/reactos/dll/win32/sxs/   (with props)
    trunk/reactos/dll/win32/sxs/sxs.c   (with props)
    trunk/reactos/dll/win32/sxs/sxs.rbuild   (with props)
    trunk/reactos/dll/win32/sxs/sxs.spec   (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=351…
==============================================================================
--- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original)
+++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Fri Aug  8 09:32:35 2008
@@ -184,6 +184,7 @@
   <property name="BASEADDRESS_KERNEL32" value="0x7c800000" />
   <property name="BASEADDRESS_NTDLL" value="0x7c900000" />
   <property name="BASEADDRESS_HHCTRL" value="0x7e410000" />
+  <property name="BASEADDRESS_SXS" value="0x7e690000" />
   <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" />
   <property name="BASEADDRESS_FREETYPE" value="0x7f000000" />
 </group>

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Aug  8 09:32:35
2008
@@ -325,6 +325,7 @@
 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

Propchange: trunk/reactos/dll/win32/sxs/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Fri Aug  8 09:32:35 2008
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/reactos/dll/win32/sxs/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/reactos/dll/win32/sxs/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: trunk/reactos/dll/win32/sxs/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: trunk/reactos/dll/win32/sxs/sxs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.c?rev=35…
==============================================================================
--- trunk/reactos/dll/win32/sxs/sxs.c (added)
+++ trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] Fri Aug  8 09:32:35 2008
@@ -1,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 <stdarg.h>
+
+#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;
+}

Propchange: trunk/reactos/dll/win32/sxs/sxs.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/sxs/sxs.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.rbuild?r…
==============================================================================
--- trunk/reactos/dll/win32/sxs/sxs.rbuild (added)
+++ trunk/reactos/dll/win32/sxs/sxs.rbuild [iso-8859-1] Fri Aug  8 09:32:35 2008
@@ -1,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<module name="sxs" type="win32dll"
baseaddress="${BASEADDRESS_SXS}" installbase="system32"
installname="sxs.dll" allowwarnings="true"
entrypoint="0">
+        <importlibrary definition="sxs.spec.def" />
+        <include base="sxs">.</include>
+        <include base="ReactOS">include/reactos/wine</include>
+        <define name="__WINESRC__" />
+        <define name="WINVER">0x600</define>
+        <define name="_WIN32_WINNT">0x600</define>
+        <file>sxs.c</file>
+        <file>sxs.spec</file>
+        <library>wine</library>
+        <library>kernel32</library>
+        <library>ntdll</library>
+</module>
+</group>

Propchange: trunk/reactos/dll/win32/sxs/sxs.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/sxs/sxs.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.spec?rev…
==============================================================================
--- trunk/reactos/dll/win32/sxs/sxs.spec (added)
+++ trunk/reactos/dll/win32/sxs/sxs.spec [iso-8859-1] Fri Aug  8 09:32:35 2008
@@ -1,0 +1,2 @@
+@ stub CreateAssemblyCache
+@ stub CreateAssemblyNameObject

Propchange: trunk/reactos/dll/win32/sxs/sxs.spec
------------------------------------------------------------------------------
    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] Fri Aug  8 09:32:35 2008
@@ -313,6 +313,9 @@
 <directory name="stdole2.tlb">
 	<xi:include href="stdole2.tlb/stdole2.rbuild" />
 </directory>
+<directory name="sxs">
+	<xi:include href="sxs/sxs.rbuild" />
+</directory>
 <directory name="syssetup">
 	<xi:include href="syssetup/syssetup.rbuild" />
 </directory>

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Aug  8 09:32:35 2008
@@ -94,6 +94,7 @@
 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