From 51e6c0ccb129a9baac001c5fd95dded62518e75b Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Sat, 31 Aug 2002 19:04:14 +0000
Subject: [PATCH] MSVC compatibility fixes.

---
 dlls/gdi/driver.c      | 3 +++
 dlls/ntdll/time.c      | 1 +
 files/profile.c        | 1 +
 include/mmddk.h        | 2 +-
 loader/ne/module.c     | 1 +
 memory/atom.c          | 1 +
 msdos/dosconf.c        | 1 +
 msdos/vxd.c            | 2 ++
 tools/winebuild/main.c | 1 +
 win32/newfns.c         | 1 +
 windows/clipboard.c    | 1 +
 11 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c
index ea03910dbb..e84943878c 100644
--- a/dlls/gdi/driver.c
+++ b/dlls/gdi/driver.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #include "winbase.h"
 #include "winreg.h"
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 82ece1fa4a..bf444037d9 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <string.h>
 #include <time.h>
diff --git a/files/profile.c b/files/profile.c
index 883d5ff390..58ffa7e715 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/include/mmddk.h b/include/mmddk.h
index b224a0124c..6a383653bc 100644
--- a/include/mmddk.h
+++ b/include/mmddk.h
@@ -301,7 +301,7 @@ typedef struct joycalibrate_tag {
 typedef JOYCALIBRATE *LPJOYCALIBRATE;
 
 /* prototype for joystick message function */
-typedef UINT CALLBACK (JOYDEVMSGPROC)(DWORD dwID, UINT uMessage, LPARAM lParam1, LPARAM lParam2);
+typedef UINT (CALLBACK * JOYDEVMSGPROC)(DWORD dwID, UINT uMessage, LPARAM lParam1, LPARAM lParam2);
 typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC;
 
 /* messages sent to joystick driver's DriverProc() function */
diff --git a/loader/ne/module.c b/loader/ne/module.c
index 525a684302..c1b2c6dcba 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -23,6 +23,7 @@
 
 #include <assert.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
diff --git a/memory/atom.c b/memory/atom.c
index cb21a1be06..cd69ee8586 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -26,6 +26,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/msdos/dosconf.c b/msdos/dosconf.c
index 636e8f738f..188fed44a4 100644
--- a/msdos/dosconf.c
+++ b/msdos/dosconf.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
diff --git a/msdos/vxd.c b/msdos/vxd.c
index 0b46559da0..7b77975ec6 100644
--- a/msdos/vxd.c
+++ b/msdos/vxd.c
@@ -19,9 +19,11 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <fcntl.h>
 #include <memory.h>
+#include <stdio.h>
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 9851edd909..4507a8c683 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -87,6 +87,7 @@ static void set_dll_file_name( const char *name )
 {
     char *p;
 
+    if ((p = strrchr( name, '\\' ))) name = p + 1;
     if ((p = strrchr( name, '/' ))) name = p + 1;
     strcpy( DLLFileName, name );
     if ((p = strrchr( DLLFileName, '.' )) && !strcmp( p, ".spec" )) *p = 0;
diff --git a/win32/newfns.c b/win32/newfns.c
index 7b5a3248b2..aee04ec2d5 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -22,6 +22,7 @@
 at a later date. */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/windows/clipboard.c b/windows/clipboard.c
index 29c674cb9f..46ee038b93 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -29,6 +29,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdlib.h>
 #include <sys/types.h>
-- 
2.32.0.93.g670b81a890