[ros-diffs] [fireball] 42066: - Remove unneeded files. - #ifdef 0 incompatible code. - winex11 fully builds.

Author: fireball
Date: Sat Jul 18 21:37:33 2009
New Revision: 42066

URL: http://svn.reactos.org/svn/reactos?rev=42066&view=rev
Log:
- Remove unneeded files.
- #ifdef 0 incompatible code.
- winex11 fully builds.

Removed:
    branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in
    branches/arwinss/reactos/dll/win32/winex11.drv/version.rc
Modified:
    branches/arwinss/reactos/dll/win32/winex11.drv/brush.c
    branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c
    branches/arwinss/reactos/dll/win32/winex11.drv/dib.c
    branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c
    branches/arwinss/reactos/dll/win32/winex11.drv/settings.c
    branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild
    branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c
    branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c

Removed: branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/Makefile.in (removed)
@@ -1,51 +1,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = winex11.drv
-IMPORTS   = user32 gdi32 advapi32 imm32 kernel32 ntdll
-DELAYIMPORTS = comctl32
-EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
-
-C_SRCS = \
-	bitblt.c \
-	bitmap.c \
-	brush.c \
-	clipboard.c \
-	codepage.c \
-	desktop.c \
-	dib.c \
-	dib_convert.c \
-	dib_dst_swap.c \
-	dib_src_swap.c \
-	event.c \
-	graphics.c \
-	ime.c \
-	init.c \
-	keyboard.c \
-	mouse.c \
-	opengl.c \
-	palette.c \
-	pen.c \
-	scroll.c \
-	settings.c \
-	systray.c \
-	text.c \
-	window.c \
-	wintab.c \
-	x11ddraw.c \
-	x11drv_main.c \
-	xdnd.c \
-	xfont.c \
-	xim.c \
-	xinerama.c \
-	xrandr.c \
-	xrender.c \
-	xvidmode.c
-
-RC_SRCS = version.rc
-
-@MAKE_DLL_RULES@
-
-@DEPENDENCIES@  # everything below this line is overwritten by make depend

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/brush.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] Sat Jul 18
21:37:33 2009
@@ -300,6 +300,7 @@
 
       case BS_DIBPATTERN:
 	TRACE("BS_DIBPATTERN\n");
+#ifndef __REACTOS__
         if ((bmpInfo = GlobalLock16( logbrush.lbHatch )))
 	{
 	    int size = bitmap_info_size( bmpInfo, logbrush.lbColor );
@@ -311,7 +312,7 @@
 	    DeleteObject( hBitmap );
             GlobalUnlock16( logbrush.lbHatch );
 	}
-
+#endif
 	break;
     }
     return hbrush;

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c [iso-8859-1] Sat Jul 18
21:37:33 2009
@@ -705,15 +705,16 @@
       {
         DeleteMetaFile(((METAFILEPICT *)GlobalLock( lpData->hData32 ))->hMF );
         GlobalFree(lpData->hData32);
-
+#ifndef __REACTOS__
 	if (lpData->hData16)
 	  /* HMETAFILE16 and HMETAFILE32 are apparently the same thing,
 	     and a shallow copy is enough to share a METAFILEPICT
 	     structure between 16bit and 32bit clipboards.  The MetaFile
 	     should of course only be deleted once. */
 	  GlobalFree16(lpData->hData16);
+#endif
       }
-
+#ifndef __REACTOS__
       if (lpData->hData16)
       {
         METAFILEPICT16* lpMetaPict = GlobalLock16(lpData->hData16);
@@ -728,6 +729,7 @@
 
 	GlobalFree16(lpData->hData16);
       }
+#endif
     }
     else if (lpData->wFormatID == CF_ENHMETAFILE)
     {
@@ -739,9 +741,10 @@
     {
       if (lpData->hData32)
         GlobalFree(lpData->hData32);
-
+#ifndef __REACTOS__
       if (lpData->hData16)
 	GlobalFree16(lpData->hData16);
+#endif
     }
 
     lpData->hData16 = 0;
@@ -983,10 +986,12 @@
     {
         lpstrS = GlobalLock(lpSource->hData32);
     }
+#ifndef __REACTOS__
     else
     {
         lpstrS = GlobalLock16(lpSource->hData16);
     }
+#endif
 
     if (!lpstrS)
         return FALSE;
@@ -1028,8 +1033,10 @@
     /* Unlock source */
     if (lpSource->hData32)
         GlobalUnlock(lpSource->hData32);
+#ifndef __REACTOS__
     else
         GlobalUnlock16(lpSource->hData16);
+#endif
 
     return X11DRV_CLIPBOARD_InsertClipboardData(wFormatID, 0, hData32, 0, NULL, TRUE);
 }
@@ -2715,6 +2722,7 @@
  */
 BOOL CDECL X11DRV_GetClipboardData(UINT wFormat, HANDLE16* phData16, HANDLE* phData32)
 {
+#ifndef __REACTOS__
     CLIPBOARDINFO cbinfo;
     LPWINE_CLIPDATA lpRender;
 
@@ -2806,7 +2814,7 @@
 
         return lpRender->hData16 || lpRender->hData32;
     }
-
+#endif
     return 0;
 }
 

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/dib.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/dib.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/dib.c [iso-8859-1] Sat Jul 18 21:37:33
2009
@@ -4366,7 +4366,7 @@
     BOOL found = FALSE;
     BYTE *addr;
     struct list *ptr;
-    const size_t pagemask = getpagesize() - 1;
+    const size_t pagemask = 4096 - 1;
 
     if (ep->ExceptionRecord->ExceptionCode != EXCEPTION_ACCESS_VIOLATION)
         return EXCEPTION_CONTINUE_SEARCH;

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] Sat Jul 18
21:37:33 2009
@@ -74,3 +74,9 @@
 {
 }
 
+struct _stat;
+int CDECL fstat(int fd, struct _stat* buf)
+{
+    int CDECL _fstat(int fd, struct _stat* buf);
+    return _fstat(fd, buf);
+}

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/settings.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] Sat Jul 18
21:37:33 2009
@@ -35,6 +35,8 @@
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(x11settings);
+
+#define HandleToULong(h)        ((ULONG)(ULONG_PTR)(h))
 
 /*
  * The DDHALMODEINFO type is used to hold all the mode information.  

Removed: branches/arwinss/reactos/dll/win32/winex11.drv/version.rc
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/version.rc [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/version.rc (removed)
@@ -1,22 +1,0 @@
-/*
- * Copyright (c) 2007 Alexandre Julliard
- *
- * 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
- */
-
-#define WINE_FILEDESCRIPTION_STR "Wine X11 driver"
-#define WINE_FILENAME_STR "winex11.drv"
-
-#include "wine/wine_common_ver.rc"

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] Sat Jul 18
21:37:33 2009
@@ -42,8 +42,11 @@
 	<file>winex11.rc</file>
 
 	<library>libX11</library>
+	<library>pseh</library>
 	<library>advapi32</library>
+	<library>msvcrt</library>
 	<library>wine</library>
+	<library>comctl32</library>
 	<library>imm32</library>
 	<library>gdi32</library>
 	<library>user32</library>

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] Sat Jul 18
21:37:33 2009
@@ -48,7 +48,7 @@
 
 #include "x11drv.h"
 #include "xvidmode.h"
-#include "xrandr.h"
+//#include "xrandr.h"
 #include "xcomposite.h"
 #include "wine/server.h"
 #include "wine/debug.h"
@@ -498,9 +498,9 @@
 
     /* Open display */
 
-    if (!(display = XOpenDisplay( NULL ))) return FALSE;
-
-    fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */
+    if (!(display = XOpenDisplay( "192.168.1.159:0.0" ))) return FALSE;
+
+    //fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */
     screen = DefaultScreenOfDisplay( display );
     visual = DefaultVisual( display, DefaultScreen(display) );
     root_window = DefaultRootWindow( display );
@@ -600,6 +600,7 @@
 /* store the display fd into the message queue */
 static void set_queue_display_fd( Display *display )
 {
+#if 0
     HANDLE handle;
     int ret;
 
@@ -620,6 +621,7 @@
         ExitProcess(1);
     }
     CloseHandle( handle );
+#endif
 }
 
 
@@ -638,7 +640,7 @@
         ExitProcess(1);
     }
     wine_tsx11_lock();
-    if (!(data->display = XOpenDisplay(NULL)))
+    if (!(data->display = XOpenDisplay("192.168.1.159:0.0")))
     {
         wine_tsx11_unlock();
         MESSAGE( "x11drv: Can't open display: %s\n", XDisplayName(NULL) );
@@ -646,7 +648,7 @@
         ExitProcess(1);
     }
 
-    fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag
*/
+    //fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag
*/
 
 #ifdef HAVE_XKB
     if (use_xkb && XkbUseExtension( data->display, NULL, NULL ))

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] Sat Jul 18
21:37:33 2009
@@ -1825,7 +1825,7 @@
  */
 static char* XFONT_UserMetricsCache( char* buffer, int* buf_size )
 {
-    const char *confdir = wine_get_config_dir();
+    const char *confdir = "";//wine_get_config_dir();
     const char *display_name = XDisplayName(NULL);
     int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 8;
     int display = 0;