Sync to Wine-20041201
Jon Griffiths <jon_p_griffiths@yahoo.com>
- Ensure DllCanUnloadNow is a truly void function, and give it a unique
  name so it can be documented per-dll.
Tom Wickline <twickline@sitestar.net>
- Version resources cleanup.

reactos/lib/mpr

diff -u -r1.3 -r1.4
--- Makefile.in	16 Oct 2004 20:27:35 -0000	1.3
+++ Makefile.in	6 Dec 2004 09:57:06 -0000	1.4
@@ -14,9 +14,7 @@

 	pwcache.c \
 	wnet.c
 

-RC_SRCS = \
-	mpr.rc
-

+RC_SRCS = mpr.rc

 
 @MAKE_DLL_RULES@
 

reactos/lib/mpr

diff -u -r1.1 -r1.2
--- mpr.spec	1 Feb 2004 19:48:44 -0000	1.1
+++ mpr.spec	6 Dec 2004 09:57:06 -0000	1.2
@@ -23,7 +23,7 @@

 24 stdcall @(ptr) MPR_Free
 25 stdcall @(ptr long) _MPR_25
 

-@ stdcall -private DllCanUnloadNow()

+@ stdcall -private DllCanUnloadNow() MPR_DllCanUnloadNow

 @ stub DllGetClassObject
 @ stdcall MultinetGetConnectionPerformanceA(ptr ptr)
 @ stdcall MultinetGetConnectionPerformanceW(ptr ptr)

reactos/lib/mpr

diff -u -r1.4 -r1.5
--- mpr_main.c	16 Jun 2004 06:58:48 -0000	1.4
+++ mpr_main.c	6 Dec 2004 09:57:06 -0000	1.5
@@ -75,7 +75,7 @@

 /*****************************************************************
  *  DllCanUnloadNow  [MPR.@]
  */

-DWORD WINAPI DllCanUnloadNow(void)

+DWORD WINAPI MPR_DllCanUnloadNow(void)

 {
     FIXME("Stub\n");
     return S_OK;

reactos/lib/mpr

diff -u -r1.1 -r1.2
--- version.rc	15 Apr 2004 09:28:04 -0000	1.1
+++ version.rc	6 Dec 2004 09:57:06 -0000	1.2
@@ -24,6 +24,5 @@

 #define WINE_FILEVERSION_STR "5.00.2195.6611"
 #define WINE_PRODUCTVERSION 5,0,2195,6611
 #define WINE_PRODUCTVERSION_STR "5.00.2195.6611"

-#define WINE_PRODUCTNAME_STR "Wine"

 
 #include "wine/wine_common_ver.rc"