10 Sep
2008
10 Sep
'08
10:57 a.m.
Author: cwittich
Date: Wed Sep 10 05:57:45 2008
New Revision: 36118
URL: http://svn.reactos.org/svn/reactos?rev=36118&view=rev
Log:
import mprapi.dll from wine 1.1.4
Added:
trunk/reactos/dll/win32/mprapi/ (with props)
trunk/reactos/dll/win32/mprapi/mprapi.c (with props)
trunk/reactos/dll/win32/mprapi/mprapi.rbuild (with props)
trunk/reactos/dll/win32/mprapi/mprapi.spec (with props)
Modified:
trunk/reactos/baseaddress.rbuild
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/reactos/dll/win32/win32.rbuild
Modified: trunk/reactos/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=361…
==============================================================================
--- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original)
+++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Sep 10 05:57:45 2008
@@ -7,6 +7,7 @@
<property name="BASEADDRESS_DEVENUM" value="0x35680000" />
<property name="BASEADDRESS_RSABASE" value="0x35700000" />
<property name="BASEADDRESS_RSAENH" value="0x35780000" />
+ <property name="BASEADDRESS_MPRAPI" value="0x4C400000" />
<property name="BASEADDRESS_PSTOREC" value="0x513D0000" />
<property name="BASEADDRESS_LPK" value="0x516C0000" />
<property name="BASEADDRESS_TELEPHON" value="0x58750000" />
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] Wed Sep 10 05:57:45
2008
@@ -273,6 +273,7 @@
dll\win32\mmdrv\mmdrv.dll 1
dll\win32\modemui\modemui.dll 1
dll\win32\mpr\mpr.dll 1
+dll\win32\mprapi\mprapi.dll 1
dll\win32\msacm32\msacm32.dll 1
dll\win32\msafd\msafd.dll 1
dll\win32\mscoree\mscoree.dll 1
Propchange: trunk/reactos/dll/win32/mprapi/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Sep 10 05:57:45 2008
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/dll/win32/mprapi/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/dll/win32/mprapi/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/dll/win32/mprapi/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Added: trunk/reactos/dll/win32/mprapi/mprapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mprapi/mprapi.c?…
==============================================================================
--- trunk/reactos/dll/win32/mprapi/mprapi.c (added)
+++ trunk/reactos/dll/win32/mprapi/mprapi.c [iso-8859-1] Wed Sep 10 05:57:45 2008
@@ -1,0 +1,55 @@
+/*
+ * Copyright (C) 2006 Dmitry Timoshkov
+ *
+ * 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 "mprapi.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mprapi);
+
+/*****************************************************
+ * DllMain
+ */
+BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
+{
+ TRACE("(%p, %d, %p)\n", hinst, reason, reserved);
+
+ switch(reason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls( hinst );
+ break;
+ }
+ return TRUE;
+}
+
+/***********************************************************************
+ * MprAdminIsServiceRunning (MPRAPI.@)
+ */
+BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server)
+{
+ FIXME("(%s): stub!\n", debugstr_w(server));
+
+ return FALSE;
+}
Propchange: trunk/reactos/dll/win32/mprapi/mprapi.c
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/mprapi/mprapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mprapi/mprapi.rb…
==============================================================================
--- trunk/reactos/dll/win32/mprapi/mprapi.rbuild (added)
+++ trunk/reactos/dll/win32/mprapi/mprapi.rbuild [iso-8859-1] Wed Sep 10 05:57:45 2008
@@ -1,0 +1,14 @@
+<module name="mprapi" type="win32dll"
baseaddress="${BASEADDRESS_MPRAPI}" installbase="system32"
installname="mprapi.dll">
+ <importlibrary definition="mprapi.spec.def" />
+ <include base="mprapi">.</include>
+ <include base="ReactOS">include/reactos/wine</include>
+ <define name="__WINESRC__" />
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x600</define>
+ <define name="_WIN32_WINNT">0x601</define>
+ <define name="WINVER">0x501</define>
+ <library>wine</library>
+ <library>kernel32</library>
+ <file>mprapi.c</file>
+ <file>mprapi.spec</file>
+</module>
Propchange: trunk/reactos/dll/win32/mprapi/mprapi.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/mprapi/mprapi.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mprapi/mprapi.sp…
==============================================================================
--- trunk/reactos/dll/win32/mprapi/mprapi.spec (added)
+++ trunk/reactos/dll/win32/mprapi/mprapi.spec [iso-8859-1] Wed Sep 10 05:57:45 2008
@@ -1,0 +1,132 @@
+@ stub CompressPhoneNumber
+@ stub MprAdminBufferFree
+@ stub MprAdminConnectionClearStats
+@ stub MprAdminConnectionEnum
+@ stub MprAdminConnectionGetInfo
+@ stub MprAdminDeregisterConnectionNotification
+@ stub MprAdminDeviceEnum
+@ stub MprAdminEstablishDomainRasServer
+@ stub MprAdminGetErrorString
+@ stub MprAdminGetPDCServer
+@ stub MprAdminInterfaceConnect
+@ stub MprAdminInterfaceCreate
+@ stub MprAdminInterfaceDelete
+@ stub MprAdminInterfaceDeviceGetInfo
+@ stub MprAdminInterfaceDeviceSetInfo
+@ stub MprAdminInterfaceDisconnect
+@ stub MprAdminInterfaceEnum
+@ stub MprAdminInterfaceGetCredentials
+@ stub MprAdminInterfaceGetCredentialsEx
+@ stub MprAdminInterfaceGetHandle
+@ stub MprAdminInterfaceGetInfo
+@ stub MprAdminInterfaceQueryUpdateResult
+@ stub MprAdminInterfaceSetCredentials
+@ stub MprAdminInterfaceSetCredentialsEx
+@ stub MprAdminInterfaceSetInfo
+@ stub MprAdminInterfaceTransportAdd
+@ stub MprAdminInterfaceTransportGetInfo
+@ stub MprAdminInterfaceTransportRemove
+@ stub MprAdminInterfaceTransportSetInfo
+@ stub MprAdminInterfaceUpdatePhonebookInfo
+@ stub MprAdminInterfaceUpdateRoutes
+@ stub MprAdminIsDomainRasServer
+@ stdcall MprAdminIsServiceRunning(wstr)
+@ stub MprAdminMIBBufferFree
+@ stub MprAdminMIBEntryCreate
+@ stub MprAdminMIBEntryDelete
+@ stub MprAdminMIBEntryGet
+@ stub MprAdminMIBEntryGetFirst
+@ stub MprAdminMIBEntryGetNext
+@ stub MprAdminMIBEntrySet
+@ stub MprAdminMIBServerConnect
+@ stub MprAdminMIBServerDisconnect
+@ stub MprAdminPortClearStats
+@ stub MprAdminPortDisconnect
+@ stub MprAdminPortEnum
+@ stub MprAdminPortGetInfo
+@ stub MprAdminPortReset
+@ stub MprAdminRegisterConnectionNotification
+@ stub MprAdminSendUserMessage
+@ stub MprAdminServerConnect
+@ stub MprAdminServerDisconnect
+@ stub MprAdminServerGetCredentials
+@ stub MprAdminServerGetInfo
+@ stub MprAdminServerSetCredentials
+@ stub MprAdminTransportCreate
+@ stub MprAdminTransportGetInfo
+@ stub MprAdminTransportSetInfo
+@ stub MprAdminUpgradeUsers
+@ stub MprAdminUserClose
+@ stub MprAdminUserGetInfo
+@ stub MprAdminUserOpen
+@ stub MprAdminUserRead
+@ stub MprAdminUserReadProfFlags
+@ stub MprAdminUserServerConnect
+@ stub MprAdminUserServerDisconnect
+@ stub MprAdminUserSetInfo
+@ stub MprAdminUserWrite
+@ stub MprAdminUserWriteProfFlags
+@ stub MprConfigBufferFree
+@ stub MprConfigGetFriendlyName
+@ stub MprConfigGetGuidName
+@ stub MprConfigInterfaceCreate
+@ stub MprConfigInterfaceDelete
+@ stub MprConfigInterfaceEnum
+@ stub MprConfigInterfaceGetHandle
+@ stub MprConfigInterfaceGetInfo
+@ stub MprConfigInterfaceSetInfo
+@ stub MprConfigInterfaceTransportAdd
+@ stub MprConfigInterfaceTransportEnum
+@ stub MprConfigInterfaceTransportGetHandle
+@ stub MprConfigInterfaceTransportGetInfo
+@ stub MprConfigInterfaceTransportRemove
+@ stub MprConfigInterfaceTransportSetInfo
+@ stub MprConfigServerBackup
+@ stub MprConfigServerConnect
+@ stub MprConfigServerDisconnect
+@ stub MprConfigServerGetInfo
+@ stub MprConfigServerInstall
+@ stub MprConfigServerRefresh
+@ stub MprConfigServerRestore
+@ stub MprConfigTransportCreate
+@ stub MprConfigTransportDelete
+@ stub MprConfigTransportEnum
+@ stub MprConfigTransportGetHandle
+@ stub MprConfigTransportGetInfo
+@ stub MprConfigTransportSetInfo
+@ stub MprDomainQueryAccess
+@ stub MprDomainQueryRasServer
+@ stub MprDomainRegisterRasServer
+@ stub MprDomainSetAccess
+@ stub MprGetUsrParams
+@ stub MprInfoBlockAdd
+@ stub MprInfoBlockFind
+@ stub MprInfoBlockQuerySize
+@ stub MprInfoBlockRemove
+@ stub MprInfoBlockSet
+@ stub MprInfoCreate
+@ stub MprInfoDelete
+@ stub MprInfoDuplicate
+@ stub MprInfoRemoveAll
+@ stub MprPortSetUsage
+@ stub MprSetupIpInIpInterfaceFriendlyNameCreate
+@ stub MprSetupIpInIpInterfaceFriendlyNameDelete
+@ stub MprSetupIpInIpInterfaceFriendlyNameEnum
+@ stub MprSetupIpInIpInterfaceFriendlyNameFree
+@ stub RasAdminBufferFree
+@ stub RasAdminConnectionClearStats
+@ stub RasAdminConnectionEnum
+@ stub RasAdminConnectionGetInfo
+@ stub RasAdminGetErrorString
+@ stub RasAdminGetPDCServer
+@ stub RasAdminIsServiceRunning
+@ stub RasAdminPortClearStats
+@ stub RasAdminPortDisconnect
+@ stub RasAdminPortEnum
+@ stub RasAdminPortGetInfo
+@ stub RasAdminPortReset
+@ stub RasAdminServerConnect
+@ stub RasAdminServerDisconnect
+@ stub RasAdminUserGetInfo
+@ stub RasAdminUserSetInfo
+@ stub RasPrivilegeAndCallBackNumber
Propchange: trunk/reactos/dll/win32/mprapi/mprapi.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] Wed Sep 10 05:57:45 2008
@@ -151,6 +151,9 @@
<directory name="mpr">
<xi:include href="mpr/mpr.rbuild" />
</directory>
+<directory name="mprapi">
+ <xi:include href="mprapi/mprapi.rbuild" />
+</directory>
<directory name="msacm32">
<xi:include href="msacm32/msacm32.rbuild" />
</directory>
5913
days inactive
5913
days old
0 comments
1 participants
participants (1)
-
cwittich＠svn.reactos.org