[ros-diffs] [fireball] 42055: - Temporary comment out most of multilanguage resources. - Get rid of even more 16 bit crap in edit.c. - user32.dll now builds.

Author: fireball
Date: Sat Jul 18 19:58:06 2009
New Revision: 42055

URL: http://svn.reactos.org/svn/reactos?rev=42055&view=rev
Log:
- Temporary comment out most of multilanguage resources.
- Get rid of even more 16 bit crap in edit.c.
- user32.dll now builds.

Modified:
    branches/arwinss/reactos/dll/win32/user32/edit.c
    branches/arwinss/reactos/dll/win32/user32/legacy.c
    branches/arwinss/reactos/dll/win32/user32/resources/user32.rc
    branches/arwinss/reactos/dll/win32/user32/sysparams.c
    branches/arwinss/reactos/dll/win32/user32/user32.rbuild
    branches/arwinss/reactos/dll/win32/user32/user32.spec
    branches/arwinss/reactos/dll/win32/user32/user_main.c
    branches/arwinss/reactos/dll/win32/user32/winproc.c

Modified: branches/arwinss/reactos/dll/win32/user32/edit.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] Sat Jul 18 19:58:06
2009
@@ -2387,7 +2387,7 @@
 	return hLocal;
 }
 
-
+#if 0
 /*********************************************************************
  *
  *	EM_GETHANDLE16
@@ -2455,7 +2455,7 @@
 	stack16->ds = oldDS;
 	return es->hloc16;
 }
-
+#endif
 
 /*********************************************************************
  *
@@ -2813,7 +2813,7 @@
 	EDIT_UpdateScrollInfo(es);
 }
 
-
+#if 0
 /*********************************************************************
  *
  *	EM_SETHANDLE16
@@ -2884,7 +2884,7 @@
 	/* force scroll info update */
 	EDIT_UpdateScrollInfo(es);
 }
-
+#endif
 
 /*********************************************************************
  *

Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sat Jul 18 19:58:06
2009
@@ -117,6 +117,6 @@
 PrivateCsrssInitialized(VOID)
 {
     /* Perform a reactos only CSRSS connection */
-    RosUserConnectCsrss();
+    //RosUserConnectCsrss();
 }
 

Modified: branches/arwinss/reactos/dll/win32/user32/resources/user32.rc
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/resources/user32.rc [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/resources/user32.rc [iso-8859-1] Sat Jul 18
19:58:06 2009
@@ -62,18 +62,18 @@
 #include "resources/user32_Ko.rc"
 #include "resources/user32_Lt.rc"
 #include "resources/user32_Nl.rc"
-#include "resources/user32_No.rc"
-#include "resources/user32_Pl.rc"
-#include "resources/user32_Pt.rc"
+//#include "resources/user32_No.rc"
+//#include "resources/user32_Pl.rc"
+//#include "resources/user32_Pt.rc"
 #include "resources/user32_Ro.rc"
-#include "resources/user32_Ru.rc"
+//#include "resources/user32_Ru.rc"
 #include "resources/user32_Si.rc"
-#include "resources/user32_Sk.rc"
-#include "resources/user32_Sv.rc"
-#include "resources/user32_Tr.rc"
-#include "resources/user32_Uk.rc"
-#include "resources/user32_Wa.rc"
-#include "resources/user32_Ja.rc"
-#include "resources/user32_Zh.rc"
+//#include "resources/user32_Sk.rc"
+//#include "resources/user32_Sv.rc"
+//#include "resources/user32_Tr.rc"
+//#include "resources/user32_Uk.rc"
+//#include "resources/user32_Wa.rc"
+//#include "resources/user32_Ja.rc"
+//#include "resources/user32_Zh.rc"
 
 //#include "resources/version.rc"

Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] Sat Jul 18 19:58:06
2009
@@ -3279,10 +3279,10 @@
         lpDevMode->dmDisplayFrequency = devmodeW.dmDisplayFrequency;
         lpDevMode->dmFields           = devmodeW.dmFields;
 
-        lpDevMode->u1.dmPosition.x = devmodeW.u1.dmPosition.x;
-        lpDevMode->u1.dmPosition.y = devmodeW.u1.dmPosition.y;
-        lpDevMode->u1.dmDisplayOrientation = devmodeW.u1.dmDisplayOrientation;
-        lpDevMode->u1.dmDisplayFixedOutput = devmodeW.u1.dmDisplayFixedOutput;
+        lpDevMode->u1.s2.dmPosition.x = devmodeW.u1.s2.dmPosition.x;
+        lpDevMode->u1.s2.dmPosition.y = devmodeW.u1.s2.dmPosition.y;
+        lpDevMode->u1.s2.dmDisplayOrientation = devmodeW.u1.s2.dmDisplayOrientation;
+        lpDevMode->u1.s2.dmDisplayFixedOutput = devmodeW.u1.s2.dmDisplayFixedOutput;
     }
     if (lpszDeviceName) RtlFreeUnicodeString(&nameW);
     return ret;

Modified: branches/arwinss/reactos/dll/win32/user32/user32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Jul 18
19:58:06 2009
@@ -6,7 +6,7 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="WINVER">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="__WINESRC__" />
 	<library>wine</library>
 	<library>ntdll</library>

Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Sat Jul 18 19:58:06
2009
@@ -163,7 +163,7 @@
 @ stdcall DialogBoxIndirectParamW(long ptr long ptr long)
 @ stdcall DialogBoxParamA(long str long ptr long)
 @ stdcall DialogBoxParamW(long wstr long ptr long)
-@ stdcall DisableProcessWindowsGhosting()
+@ stub DisableProcessWindowsGhosting
 @ stdcall DispatchMessageA(ptr)
 @ stdcall DispatchMessageW(ptr)
 @ stub DisplayExitWindowsWarnings

Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] Sat Jul 18 19:58:06
2009
@@ -409,7 +409,7 @@
 }
 
 
-BOOL ClientThreadSetup()
+BOOL WINAPI ClientThreadSetup()
 {
     TRACE(": stub\n");
     return TRUE;

Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] Sat Jul 18 19:58:06
2009
@@ -277,6 +277,7 @@
 
 
 #ifdef __i386__
+#define __ASM_CFI(str) ""
 /* Some window procedures modify register they shouldn't, or are not
  * properly declared stdcall; so we need a small assembly wrapper to
  * call them. */