remove some __WINESRC__es

[Dimitrie O. Paun]

No need to clutter the header files with these tests.
We have enough of a review process in place to avoid
such things, and in any way, things like

#ifdef __WINESRC__
# undef UNICODE
#endif  /* __WINESRC__ */

simply encourage bad coding, hides problems, and it's
confusing.

ChangeLog
  Remove some unneeded __WINESRC__ tests from the headers.
  Miscellaneous cleanups and fixes.

Index: include/windef.h
===================================================================
RCS file: /var/cvs/wine/include/windef.h,v
retrieving revision 1.84
diff -u -r1.84 windef.h
--- include/windef.h	15 Jan 2003 03:31:49 -0000	1.84
+++ include/windef.h	22 Aug 2003 19:10:04 -0000
@@ -21,10 +21,6 @@
 #ifndef __WINE_WINDEF_H
 #define __WINE_WINDEF_H
 
-#ifdef __WINESRC__
-# undef UNICODE
-#endif  /* __WINESRC__ */
-
 #ifndef WINVER
 #define WINVER 0x0500
 #endif
@@ -67,8 +63,6 @@
 # endif
 #endif /* __stdcall */
 
-#ifndef __WINESRC__
-
 #ifndef pascal
 #define pascal      __stdcall
 #endif
@@ -120,8 +114,6 @@
 #define __declspec(x)
 #endif
 
-#endif /* __WINESRC__ */
-
 #define CALLBACK    __stdcall
 #define WINAPI      __stdcall
 #define APIPRIVATE  __stdcall
@@ -184,7 +176,6 @@
 #include "winnt.h"
 
 /* Macros to map Winelib names to the correct implementation name */
-/* depending on __WINESRC__ and UNICODE macros.                   */
 /* Note that Winelib is purely Win32.                             */
 
 #ifdef __WINESRC__
Index: include/wtypes.idl
===================================================================
RCS file: /var/cvs/wine/include/wtypes.idl,v
retrieving revision 1.11
diff -u -r1.11 wtypes.idl
--- include/wtypes.idl	20 Jun 2003 21:30:37 -0000	1.11
+++ include/wtypes.idl	22 Aug 2003 19:15:31 -0000
@@ -263,7 +263,7 @@
 typedef [string] OLECHAR *LPOLESTR;
 typedef [string] const OLECHAR *LPCOLESTR;
 cpp_quote("#ifndef __WINESRC__")
-cpp_quote("#define OLESTR(str) WINE_UNICODE_TEXT(str)")
+cpp_quote("#define OLESTR(str) L##str")
 cpp_quote("#endif")
 
 /* from Wine's pre-WIDL wtypes.h */
Index: dlls/dpnhpast/main.c
===================================================================
RCS file: /var/cvs/wine/dlls/dpnhpast/main.c,v
retrieving revision 1.3
diff -u -r1.3 main.c
--- dlls/dpnhpast/main.c	30 Jun 2003 20:53:49 -0000	1.3
+++ dlls/dpnhpast/main.c	24 Aug 2003 15:19:55 -0000
@@ -89,7 +89,7 @@
  *
  *
  */
-HRESULT WINAPI DPNHPAST_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID FAR)
+HRESULT WINAPI DPNHPAST_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID farParm)
 {
 	FIXME(":stub\n");
 	return E_FAIL;
Index: dlls/opengl32/opengl_norm.c
===================================================================
RCS file: /var/cvs/wine/dlls/opengl32/opengl_norm.c,v
retrieving revision 1.9
diff -u -r1.9 opengl_norm.c
--- dlls/opengl32/opengl_norm.c	8 Jul 2003 21:07:03 -0000	1.9
+++ dlls/opengl32/opengl_norm.c	24 Aug 2003 14:09:00 -0000
@@ -802,10 +802,10 @@
 /***********************************************************************
  *              glDepthRange (OPENGL32.@)
  */
-void WINAPI wine_glDepthRange( GLclampd near, GLclampd far ) {
-  TRACE("(%f, %f)\n", near, far );
+void WINAPI wine_glDepthRange( GLclampd nearParm, GLclampd farParm ) {
+  TRACE("(%f, %f)\n", nearParm, farParm );
   ENTER_GL();
-  glDepthRange( near, far );
+  glDepthRange( nearParm, farParm );
   LEAVE_GL();
 }
 


-- 
Dimi.