Author: fireball
Date: Sat Nov 27 21:38:11 2010
New Revision: 49825
URL:
http://svn.reactos.org/svn/reactos?rev=49825&view=rev
Log:
[MPRAPI]
- Sync to Wine-1.3.8
See issue #5718 for more details.
Modified:
trunk/reactos/dll/win32/mprapi/mprapi.c
trunk/reactos/dll/win32/mprapi/mprapi.spec
trunk/reactos/media/doc/README.WINE
Modified: 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 [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mprapi/mprapi.c [iso-8859-1] Sat Nov 27 21:38:11 2010
@@ -45,6 +45,32 @@
}
/***********************************************************************
+ * MprAdminGetErrorString (MPRAPI.@)
+ *
+ * Return a unicode string for the given mpr errorcode
+ *
+ * PARAMS
+ * mprerror [i] errorcode, for which a description is requested
+ * localstr [o] pointer, where a buffer with the error description is returned
+ *
+ * RETURNS
+ * Failure: ERROR_MR_MID_NOT_FOUND, when mprerror is not known
+ * Success: ERROR_SUCCESS, and in localstr a pointer to a buffer from LocalAlloc,
+ * which contains the error description.
+ *
+ * NOTES
+ * The caller must free the returned buffer with LocalFree
+ *
+ */
+DWORD APIENTRY MprAdminGetErrorString(DWORD mprerror, LPWSTR *localstr)
+{
+ FIXME("(0x%x/%u, %p): stub!\n", mprerror, mprerror, localstr);
+
+ *localstr = NULL;
+ return ERROR_MR_MID_NOT_FOUND;
+}
+
+/***********************************************************************
* MprAdminIsServiceRunning (MPRAPI.@)
*/
BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server)
Modified: 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 [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mprapi/mprapi.spec [iso-8859-1] Sat Nov 27 21:38:11 2010
@@ -6,7 +6,7 @@
@ stub MprAdminDeregisterConnectionNotification
@ stub MprAdminDeviceEnum
@ stub MprAdminEstablishDomainRasServer
-@ stub MprAdminGetErrorString
+@ stdcall MprAdminGetErrorString(long ptr)
@ stub MprAdminGetPDCServer
@ stub MprAdminInterfaceConnect
@ stub MprAdminInterfaceCreate
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] Sat Nov 27 21:38:11 2010
@@ -90,6 +90,7 @@
reactos/dll/win32/mciwave # Autosync
reactos/dll/win32/mlang # Autosync
reactos/dll/win32/mpr # Autosync
+reactos/dll/win32/mprapi # Autosync
reactos/dll/win32/msacm32 # Autosync
reactos/dll/win32/msadp32.acm # Autosync
reactos/dll/win32/mscat32 # Autosync